diff options
Diffstat (limited to 'settings')
| -rwxr-xr-x | settings/admin.php | 2 | ||||
| -rw-r--r-- | settings/ajax/lostpassword.php | 2 | ||||
| -rw-r--r-- | settings/css/settings.css | 20 | ||||
| -rw-r--r-- | settings/l10n/da.php | 7 | ||||
| -rw-r--r-- | settings/templates/admin.php | 19 |
5 files changed, 48 insertions, 2 deletions
diff --git a/settings/admin.php b/settings/admin.php index 80b038d2ef6..23b3a2d5a0e 100755 --- a/settings/admin.php +++ b/settings/admin.php @@ -45,6 +45,8 @@ $tmpl->assign('isWebDavWorking', OC_Util::isWebDAVWorking()); $tmpl->assign('has_fileinfo', OC_Util::fileInfoLoaded()); $tmpl->assign('old_php', OC_Util::isPHPoutdated()); $tmpl->assign('backgroundjobs_mode', OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax')); +$tmpl->assign('cron_log', OC_Config::getValue('cron_log', true)); +$tmpl->assign('lastcron', OC_Appconfig::getValue('core', 'lastcron', false)); $tmpl->assign('shareAPIEnabled', OC_Appconfig::getValue('core', 'shareapi_enabled', 'yes')); // Check if connected using HTTPS diff --git a/settings/ajax/lostpassword.php b/settings/ajax/lostpassword.php index b5f47bbceab..88c2bee6142 100644 --- a/settings/ajax/lostpassword.php +++ b/settings/ajax/lostpassword.php @@ -6,7 +6,7 @@ OCP\JSON::callCheck(); $l=OC_L10N::get('core'); // Get data -if( isset( $_POST['email'] ) && filter_var( $_POST['email'], FILTER_VALIDATE_EMAIL) ) { +if( isset( $_POST['email'] ) && OC_Mail::validateAddress($_POST['email']) ) { $email=trim($_POST['email']); OC_Preferences::setValue(OC_User::getUser(), 'settings', 'email', $email); OC_JSON::success(array("data" => array( "message" => $l->t("Email saved") ))); diff --git a/settings/css/settings.css b/settings/css/settings.css index a47e7bf6563..280d022af4e 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -167,6 +167,26 @@ table.shareAPI td { padding-bottom: 0.8em; } width: 40px; } +.cronlog { + margin-left: 10px; +} + +.cronstatus { + display: inline-block; + height: 16px; + width: 16px; + vertical-align: text-bottom; +} + +span.success { + background: #37ce02; + border-radius: 8px; +} + +span.error { + background: #ce3702; +} + /* HELP */ .pressed {background-color:#DDD;} diff --git a/settings/l10n/da.php b/settings/l10n/da.php index d8ee237bed5..42c99b2fc26 100644 --- a/settings/l10n/da.php +++ b/settings/l10n/da.php @@ -25,7 +25,9 @@ $TRANSLATIONS = array( "Wrong admin recovery password. Please check the password and try again." => "Forkert admin gendannelseskode. Se venligst koden efter og prøv igen.", "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Serveren understøtter ikke kodeordsskifte, men brugernes krypteringsnøgle blev opdateret.", "Unable to change password" => "Kunne ikke ændre kodeord", +"Sending..." => "Sender...", "User Documentation" => "Brugerdokumentation", +"Admin Documentation" => "Administrator Dokumentation", "Update to {appversion}" => "Opdatér til {appversion}", "Disable" => "Deaktiver", "Enable" => "Aktiver", @@ -38,6 +40,11 @@ $TRANSLATIONS = array( "Update" => "Opdater", "Updated" => "Opdateret", "Select a profile picture" => "Vælg et profilbillede", +"Very weak password" => "Meget svagt kodeord", +"Weak password" => "Svagt kodeord", +"So-so password" => "Jævnt kodeord", +"Good password" => "Godt kodeord", +"Strong password" => "Stærkt kodeord", "Decrypting files... Please wait, this can take some time." => "Dekryptere filer... Vent venligst, dette kan tage lang tid. ", "deleted" => "Slettet", "undo" => "fortryd", diff --git a/settings/templates/admin.php b/settings/templates/admin.php index 6e816c1fff6..9092d2833fd 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -157,7 +157,24 @@ if (!$_['internetconnectionworking']) { ;?> <fieldset class="personalblock" id="backgroundjobs"> - <h2><?php p($l->t('Cron'));?></h2> + <h2 class="inlineblock"><?php p($l->t('Cron'));?></h2> + <?php if ($_['cron_log']): ?> + <p class="cronlog inlineblock"> + <?php if ($_['lastcron'] !== false): + $human_time = OC_Util::formatDate($_['lastcron']) . " UTC"; + if (time() - $_['lastcron'] <= 3600): ?> + <span class="cronstatus success"></span> + <?php p($l->t("Last cron was executed at %s.", array($human_time))); + else: ?> + <span class="cronstatus error"></span> + <?php p($l->t("Last cron was executed at %s. This is more than an hour ago, something seems wrong.", array($human_time))); + endif; + else: ?> + <span class="cronstatus error"></span> + <?php p($l->t("Cron was not executed yet!")); + endif; ?> + </p> + <?php endif; ?> <p> <input type="radio" name="mode" value="ajax" id="backgroundjobs_ajax" <?php if ($_['backgroundjobs_mode'] === "ajax") { |