Browse Source

Fix review issues

tags/v5.0.0beta2
Bart Visscher 11 years ago
parent
commit
59582e0f3f
2 changed files with 18 additions and 17 deletions
  1. 14
    13
      apps/files_versions/lib/versions.php
  2. 4
    4
      core/templates/layout.user.php

+ 14
- 13
apps/files_versions/lib/versions.php View File

@@ -20,19 +20,20 @@ class Storage {
const DEFAULTENABLED=true;
const DEFAULTMAXSIZE=50; // unit: percentage; 50% of available disk space/quota
private static $max_versions_per_interval = array( //first 10sec, one version every 2sec
1 => array('intervalEndsAfter' => 10, 'step' => 2),
//next minute, one version every 10sec
2 => array('intervalEndsAfter' => 60, 'step' => 10),
//next hour, one version every minute
3 => array('intervalEndsAfter' => 3600, 'step' => 60),
//next 24h, one version every hour
4 => array('intervalEndsAfter' => 86400, 'step' => 3600),
//next 30days, one version per day
5 => array('intervalEndsAfter' => 2592000, 'step' => 86400),
//until the end one version per week
6 => array('intervalEndsAfter' => -1, 'step' => 604800),
);
private static $max_versions_per_interval = array(
//first 10sec, one version every 2sec
1 => array('intervalEndsAfter' => 10, 'step' => 2),
//next minute, one version every 10sec
2 => array('intervalEndsAfter' => 60, 'step' => 10),
//next hour, one version every minute
3 => array('intervalEndsAfter' => 3600, 'step' => 60),
//next 24h, one version every hour
4 => array('intervalEndsAfter' => 86400, 'step' => 3600),
//next 30days, one version per day
5 => array('intervalEndsAfter' => 2592000, 'step' => 86400),
//until the end one version per week
6 => array('intervalEndsAfter' => -1, 'step' => 604800),
);

private static function getUidAndFilename($filename) {
$uid = \OC\Files\Filesystem::getOwner($filename);

+ 4
- 4
core/templates/layout.user.php View File

@@ -1,8 +1,8 @@
<!DOCTYPE html>
<html>
<head>
<title><?php echo !empty($_['application'])?$_['application'].' | ':''
?>ownCloud <?php echo !empty($_['user_displayname'])?' ('.$_['user_displayname'].') ':'' ?></title>
<title><?php echo !empty($_['application'])?$_['application'].' | ':'' ?>ownCloud
<?php echo !empty($_['user_displayname'])?' ('.$_['user_displayname'].') ':'' ?></title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="apple-itunes-app" content="app-id=543672169">
<link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" />
@@ -49,8 +49,8 @@
<?php endforeach; ?>
<li>
<a id="logout" href="<?php echo link_to('', 'index.php'); ?>?logout=true">
<img class="svg" alt="" src="<?php echo image_path('', 'actions/logout.svg'); ?>"
/> <?php echo $l->t('Log out');?>
<img class="svg" alt="" src="<?php echo image_path('', 'actions/logout.svg'); ?>" />
<?php echo $l->t('Log out');?>
</a>
</li>
</div>

Loading…
Cancel
Save