@@ -72,11 +72,17 @@ discard block |
||
| 72 | 72 | </select> |
| 73 | 73 | |
| 74 | 74 | <label id="mail_smtpsecure_label" for="mail_smtpsecure" |
| 75 | - <?php if ($_['mail_smtpmode'] != 'smtp') print_unescaped(' class="hidden"'); ?>> |
|
| 75 | + <?php if ($_['mail_smtpmode'] != 'smtp') { |
|
| 76 | + print_unescaped(' class="hidden"'); |
|
| 77 | +} |
|
| 78 | +?>> |
|
| 76 | 79 | <?php p($l->t( 'Encryption' )); ?> |
| 77 | 80 | </label> |
| 78 | 81 | <select name="mail_smtpsecure" id="mail_smtpsecure" |
| 79 | - <?php if ($_['mail_smtpmode'] != 'smtp') print_unescaped(' class="hidden"'); ?>> |
|
| 82 | + <?php if ($_['mail_smtpmode'] != 'smtp') { |
|
| 83 | + print_unescaped(' class="hidden"'); |
|
| 84 | +} |
|
| 85 | +?>> |
|
| 80 | 86 | <?php foreach ($mail_smtpsecure as $secure => $name): |
| 81 | 87 | $selected = ''; |
| 82 | 88 | if ($secure == $_['mail_smtpsecure']): |
@@ -95,7 +101,10 @@ discard block |
||
| 95 | 101 | value='<?php p($_['mail_domain']) ?>' /> |
| 96 | 102 | </p> |
| 97 | 103 | |
| 98 | - <p id="setting_smtpauth" <?php if ($_['mail_smtpmode'] != 'smtp') print_unescaped(' class="hidden"'); ?>> |
|
| 104 | + <p id="setting_smtpauth" <?php if ($_['mail_smtpmode'] != 'smtp') { |
|
| 105 | + print_unescaped(' class="hidden"'); |
|
| 106 | +} |
|
| 107 | +?>> |
|
| 99 | 108 | <label for="mail_smtpauthtype"><?php p($l->t( 'Authentication method' )); ?></label> |
| 100 | 109 | <select name='mail_smtpauthtype' id='mail_smtpauthtype'> |
| 101 | 110 | <?php foreach ($mail_smtpauthtype as $authtype => $name): |
@@ -108,11 +117,17 @@ discard block |
||
| 108 | 117 | </select> |
| 109 | 118 | |
| 110 | 119 | <input type="checkbox" name="mail_smtpauth" id="mail_smtpauth" class="checkbox" value="1" |
| 111 | - <?php if ($_['mail_smtpauth']) print_unescaped('checked="checked"'); ?> /> |
|
| 120 | + <?php if ($_['mail_smtpauth']) { |
|
| 121 | + print_unescaped('checked="checked"'); |
|
| 122 | +} |
|
| 123 | +?> /> |
|
| 112 | 124 | <label for="mail_smtpauth"><?php p($l->t( 'Authentication required' )); ?></label> |
| 113 | 125 | </p> |
| 114 | 126 | |
| 115 | - <p id="setting_smtphost" <?php if ($_['mail_smtpmode'] != 'smtp') print_unescaped(' class="hidden"'); ?>> |
|
| 127 | + <p id="setting_smtphost" <?php if ($_['mail_smtpmode'] != 'smtp') { |
|
| 128 | + print_unescaped(' class="hidden"'); |
|
| 129 | +} |
|
| 130 | +?>> |
|
| 116 | 131 | <label for="mail_smtphost"><?php p($l->t( 'Server address' )); ?></label> |
| 117 | 132 | <input type="text" name='mail_smtphost' id="mail_smtphost" placeholder="smtp.example.com" |
| 118 | 133 | value='<?php p($_['mail_smtphost']) ?>' /> |
@@ -122,7 +137,10 @@ discard block |
||
| 122 | 137 | </p> |
| 123 | 138 | </form> |
| 124 | 139 | <form class="mail_settings" id="mail_credentials_settings"> |
| 125 | - <p id="mail_credentials" <?php if (!$_['mail_smtpauth'] || $_['mail_smtpmode'] != 'smtp') print_unescaped(' class="hidden"'); ?>> |
|
| 140 | + <p id="mail_credentials" <?php if (!$_['mail_smtpauth'] || $_['mail_smtpmode'] != 'smtp') { |
|
| 141 | + print_unescaped(' class="hidden"'); |
|
| 142 | +} |
|
| 143 | +?>> |
|
| 126 | 144 | <label for="mail_smtpname"><?php p($l->t( 'Credentials' )); ?></label> |
| 127 | 145 | <input type="text" name='mail_smtpname' id="mail_smtpname" placeholder="<?php p($l->t('SMTP Username'))?>" |
| 128 | 146 | value='<?php p($_['mail_smtpname']) ?>' /> |
@@ -35,7 +35,10 @@ discard block |
||
| 35 | 35 | <p id="enable"> |
| 36 | 36 | <input type="checkbox" |
| 37 | 37 | id="enableEncryption" class="checkbox" |
| 38 | - value="1" <?php if ($_['encryptionEnabled']) print_unescaped('checked="checked" disabled="disabled"'); ?> /> |
|
| 38 | + value="1" <?php if ($_['encryptionEnabled']) { |
|
| 39 | + print_unescaped('checked="checked" disabled="disabled"'); |
|
| 40 | +} |
|
| 41 | +?> /> |
|
| 39 | 42 | <label |
| 40 | 43 | for="enableEncryption"><?php p($l->t('Enable server-side encryption')); ?> <span id="startmigration_msg" class="msg"></span> </label><br/> |
| 41 | 44 | </p> |
@@ -54,8 +57,14 @@ discard block |
||
| 54 | 57 | value="<?php p($l->t("Enable encryption")); ?>" /></p> |
| 55 | 58 | </div> |
| 56 | 59 | |
| 57 | - <div id="EncryptionSettingsArea" class="<?php if (!$_['encryptionEnabled']) p('hidden'); ?>"> |
|
| 58 | - <div id='selectEncryptionModules' class="<?php if (!$_['encryptionReady']) p('hidden'); ?>"> |
|
| 60 | + <div id="EncryptionSettingsArea" class="<?php if (!$_['encryptionEnabled']) { |
|
| 61 | + p('hidden'); |
|
| 62 | +} |
|
| 63 | +?>"> |
|
| 64 | + <div id='selectEncryptionModules' class="<?php if (!$_['encryptionReady']) { |
|
| 65 | + p('hidden'); |
|
| 66 | +} |
|
| 67 | +?>"> |
|
| 59 | 68 | <?php |
| 60 | 69 | if (empty($_['encryptionModules'])) { |
| 61 | 70 | p($l->t('No encryption module loaded, please enable an encryption module in the app menu.')); |
@@ -76,7 +85,10 @@ discard block |
||
| 76 | 85 | </fieldset> |
| 77 | 86 | <?php } ?> |
| 78 | 87 | </div> |
| 79 | - <div id="migrationWarning" class="<?php if ($_['encryptionReady']) p('hidden'); ?>"> |
|
| 88 | + <div id="migrationWarning" class="<?php if ($_['encryptionReady']) { |
|
| 89 | + p('hidden'); |
|
| 90 | +} |
|
| 91 | +?>"> |
|
| 80 | 92 | <?php |
| 81 | 93 | if ($_['encryptionReady'] === false && $_['externalBackendsEnabled'] === true) { |
| 82 | 94 | p($l->t('You need to migrate your encryption keys from the old encryption (ownCloud <= 8.0) to the new one. Please enable the "Default encryption module" and run \'occ encryption:migrate\'')); |
@@ -46,28 +46,40 @@ discard block |
||
| 46 | 46 | <div id="userlistoptions"> |
| 47 | 47 | <p> |
| 48 | 48 | <input type="checkbox" name="StorageLocation" value="StorageLocation" id="CheckboxStorageLocation" |
| 49 | - class="checkbox" <?php if ($_['show_storage_location'] === 'true') print_unescaped('checked="checked"'); ?> /> |
|
| 49 | + class="checkbox" <?php if ($_['show_storage_location'] === 'true') { |
|
| 50 | + print_unescaped('checked="checked"'); |
|
| 51 | +} |
|
| 52 | +?> /> |
|
| 50 | 53 | <label for="CheckboxStorageLocation"> |
| 51 | 54 | <?php p($l->t('Show storage location')) ?> |
| 52 | 55 | </label> |
| 53 | 56 | </p> |
| 54 | 57 | <p> |
| 55 | 58 | <input type="checkbox" name="LastLogin" value="LastLogin" id="CheckboxLastLogin" |
| 56 | - class="checkbox" <?php if ($_['show_last_login'] === 'true') print_unescaped('checked="checked"'); ?> /> |
|
| 59 | + class="checkbox" <?php if ($_['show_last_login'] === 'true') { |
|
| 60 | + print_unescaped('checked="checked"'); |
|
| 61 | +} |
|
| 62 | +?> /> |
|
| 57 | 63 | <label for="CheckboxLastLogin"> |
| 58 | 64 | <?php p($l->t('Show last log in')) ?> |
| 59 | 65 | </label> |
| 60 | 66 | </p> |
| 61 | 67 | <p> |
| 62 | 68 | <input type="checkbox" name="UserBackend" value="UserBackend" id="CheckboxUserBackend" |
| 63 | - class="checkbox" <?php if ($_['show_backend'] === 'true') print_unescaped('checked="checked"'); ?> /> |
|
| 69 | + class="checkbox" <?php if ($_['show_backend'] === 'true') { |
|
| 70 | + print_unescaped('checked="checked"'); |
|
| 71 | +} |
|
| 72 | +?> /> |
|
| 64 | 73 | <label for="CheckboxUserBackend"> |
| 65 | 74 | <?php p($l->t('Show user backend')) ?> |
| 66 | 75 | </label> |
| 67 | 76 | </p> |
| 68 | 77 | <p> |
| 69 | 78 | <input type="checkbox" name="MailOnUserCreate" value="MailOnUserCreate" id="CheckboxMailOnUserCreate" |
| 70 | - class="checkbox" <?php if ($_['send_email'] === 'true') print_unescaped('checked="checked"'); ?> /> |
|
| 79 | + class="checkbox" <?php if ($_['send_email'] === 'true') { |
|
| 80 | + print_unescaped('checked="checked"'); |
|
| 81 | +} |
|
| 82 | +?> /> |
|
| 71 | 83 | <label for="CheckboxMailOnUserCreate"> |
| 72 | 84 | <?php p($l->t('Send email to new user')) ?> |
| 73 | 85 | </label> |
@@ -77,7 +89,10 @@ discard block |
||
| 77 | 89 | </p> |
| 78 | 90 | <p> |
| 79 | 91 | <input type="checkbox" name="EmailAddress" value="EmailAddress" id="CheckboxEmailAddress" |
| 80 | - class="checkbox" <?php if ($_['show_email'] === 'true') print_unescaped('checked="checked"'); ?> /> |
|
| 92 | + class="checkbox" <?php if ($_['show_email'] === 'true') { |
|
| 93 | + print_unescaped('checked="checked"'); |
|
| 94 | +} |
|
| 95 | +?> /> |
|
| 81 | 96 | <label for="CheckboxEmailAddress"> |
| 82 | 97 | <?php p($l->t('Show email address')) ?> |
| 83 | 98 | </label> |
@@ -23,8 +23,11 @@ |
||
| 23 | 23 | <?php p($rootCert->getIssuerName()) ?> |
| 24 | 24 | </td> |
| 25 | 25 | <td <?php if ($rootCert != ''): ?>class="remove" |
| 26 | - <?php else: ?>style="visibility:hidden;" |
|
| 27 | - <?php endif; ?>><img alt="<?php p($l->t('Delete')); ?>" |
|
| 26 | + <?php else { |
|
| 27 | + : ?>style="visibility:hidden;" |
|
| 28 | + <?php endif; |
|
| 29 | +} |
|
| 30 | +?>><img alt="<?php p($l->t('Delete')); ?>" |
|
| 28 | 31 | title="<?php p($l->t('Delete')); ?>" |
| 29 | 32 | class="action" |
| 30 | 33 | src="<?php print_unescaped(image_path('core', 'actions/delete.svg')); ?>"/> |
@@ -66,7 +66,7 @@ |
||
| 66 | 66 | // Return Success story |
| 67 | 67 | if($username) { |
| 68 | 68 | $targetUserObject->setQuota($quota); |
| 69 | -}else{//set the default quota when no username is specified |
|
| 69 | +} else{//set the default quota when no username is specified |
|
| 70 | 70 | if($quota === 'default') {//'default' as default quota makes no sense |
| 71 | 71 | $quota='none'; |
| 72 | 72 | } |
@@ -82,7 +82,7 @@ |
||
| 82 | 82 | ]; |
| 83 | 83 | } |
| 84 | 84 | $subAdmins = $result; |
| 85 | -}else{ |
|
| 85 | +} else{ |
|
| 86 | 86 | /* Retrieve group IDs from $groups array, so we can pass that information into OC_Group::displayNamesInGroups() */ |
| 87 | 87 | $gids = array(); |
| 88 | 88 | foreach($groups as $group) { |
@@ -39,7 +39,7 @@ |
||
| 39 | 39 | $url=\OCP\Util::linkToAbsolute( 'core', 'doc/admin/index.html' ); |
| 40 | 40 | $style1=''; |
| 41 | 41 | $style2=' active'; |
| 42 | -}else{ |
|
| 42 | +} else{ |
|
| 43 | 43 | $url=\OCP\Util::linkToAbsolute( 'core', 'doc/user/index.html' ); |
| 44 | 44 | $style1=' active'; |
| 45 | 45 | $style2=''; |
@@ -12,7 +12,10 @@ discard block |
||
| 12 | 12 | |
| 13 | 13 | <p> |
| 14 | 14 | <input type="checkbox" name="outgoing_server2server_share_enabled" id="outgoingServer2serverShareEnabled" class="checkbox" |
| 15 | - value="1" <?php if ($_['outgoingServer2serverShareEnabled']) print_unescaped('checked="checked"'); ?> /> |
|
| 15 | + value="1" <?php if ($_['outgoingServer2serverShareEnabled']) { |
|
| 16 | + print_unescaped('checked="checked"'); |
|
| 17 | +} |
|
| 18 | +?> /> |
|
| 16 | 19 | <label for="outgoingServer2serverShareEnabled"> |
| 17 | 20 | <?php p($l->t('Allow users on this server to send shares to other servers'));?> |
| 18 | 21 | </label> |
@@ -20,7 +23,10 @@ discard block |
||
| 20 | 23 | |
| 21 | 24 | <p> |
| 22 | 25 | <input type="checkbox" name="incoming_server2server_share_enabled" id="incomingServer2serverShareEnabled" class="checkbox" |
| 23 | - value="1" <?php if ($_['incomingServer2serverShareEnabled']) print_unescaped('checked="checked"'); ?> /> |
|
| 26 | + value="1" <?php if ($_['incomingServer2serverShareEnabled']) { |
|
| 27 | + print_unescaped('checked="checked"'); |
|
| 28 | +} |
|
| 29 | +?> /> |
|
| 24 | 30 | <label for="incomingServer2serverShareEnabled"> |
| 25 | 31 | <?php p($l->t('Allow users on this server to receive shares from other servers'));?> |
| 26 | 32 | </label><br/> |
@@ -74,7 +74,7 @@ |
||
| 74 | 74 | $preview->showPreview(); |
| 75 | 75 | } catch (\OC\PreviewNotAvailableException $e) { |
| 76 | 76 | \OC_Response::setStatus(404); |
| 77 | -}catch(\Exception $e) { |
|
| 77 | +} catch(\Exception $e) { |
|
| 78 | 78 | \OC_Response::setStatus(500); |
| 79 | 79 | \OCP\Util::writeLog('core', $e->getmessage(), \OCP\Util::DEBUG); |
| 80 | 80 | } |