summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBart Visscher <bartv@thisnet.nl>2013-02-14 22:53:30 +0100
committerBart Visscher <bartv@thisnet.nl>2013-02-21 23:47:21 +0100
commitdb8dbb9847da1a6f1146153414f8bd3bac4ca980 (patch)
treec1b13d9817f33da2329da942bc3feaef49165b06
parentfb7de774741c939ffc03b083fe75bae0560b1c85 (diff)
downloadnextcloud-server-db8dbb9847da1a6f1146153414f8bd3bac4ca980.tar.gz
nextcloud-server-db8dbb9847da1a6f1146153414f8bd3bac4ca980.zip
Style cleanup files_versions
-rw-r--r--apps/files_versions/lib/versions.php35
-rw-r--r--apps/files_versions/templates/history.php3
-rw-r--r--apps/files_versions/templates/settings.php5
3 files changed, 26 insertions, 17 deletions
diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index ba9f8ba41cb..39c00001b4d 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -20,19 +20,18 @@ class Storage {
const DEFAULTENABLED=true;
const DEFAULTMAXSIZE=50; // unit: percentage; 50% of available disk space/quota
- private static $max_versions_per_interval = array(
- 1 => array('intervalEndsAfter' => 10, //first 10sec, one version every 2sec
- 'step' => 2),
- 2 => array('intervalEndsAfter' => 60, //next minute, one version every 10sec
- 'step' => 10),
- 3 => array('intervalEndsAfter' => 3600, //next hour, one version every minute
- 'step' => 60),
- 4 => array('intervalEndsAfter' => 86400, //next 24h, one version every hour
- 'step' => 3600),
- 5 => array('intervalEndsAfter' => 2592000, //next 30days, one version per day
- 'step' => 86400),
- 6 => array('intervalEndsAfter' => -1, //until the end one version per week
- '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) {
@@ -238,7 +237,10 @@ class Storage {
$versions_fileview = new \OC\Files\View('/'.$uid.'/files_versions');
$versionsRoot = \OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath('');
- $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($versionsRoot), \RecursiveIteratorIterator::CHILD_FIRST);
+ $iterator = new \RecursiveIteratorIterator(
+ new \RecursiveDirectoryIterator($versionsRoot),
+ \RecursiveIteratorIterator::CHILD_FIRST
+ );
$size = 0;
@@ -263,7 +265,10 @@ class Storage {
$versions_fileview = new \OC\Files\View('/'.$uid.'/files_versions');
$versionsRoot = \OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath('');
- $iterator = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($versionsRoot), \RecursiveIteratorIterator::CHILD_FIRST);
+ $iterator = new \RecursiveIteratorIterator(
+ new \RecursiveDirectoryIterator($versionsRoot),
+ \RecursiveIteratorIterator::CHILD_FIRST
+ );
$versions = array();
diff --git a/apps/files_versions/templates/history.php b/apps/files_versions/templates/history.php
index 850ece89c98..c450af66ad5 100644
--- a/apps/files_versions/templates/history.php
+++ b/apps/files_versions/templates/history.php
@@ -22,7 +22,8 @@ if( isset( $_['message'] ) ) {
foreach ( $_['versions'] as $v ) {
echo ' ';
echo OCP\Util::formatDate( doubleval($v['version']) );
- echo ' <a href="'.OCP\Util::linkTo('files_versions', 'history.php', array('path' => $_['path'], 'revert' => $v['version'])) .'" class="button">Revert</a><br /><br />';
+ echo ' <a href="'.OCP\Util::linkTo('files_versions', 'history.php',
+ array('path' => $_['path'], 'revert' => $v['version'])) .'" class="button">Revert</a><br /><br />';
if ( $v['cur'] ) {
echo ' (<b>Current</b>)';
}
diff --git a/apps/files_versions/templates/settings.php b/apps/files_versions/templates/settings.php
index bfca8366f5d..3b8e4baf119 100644
--- a/apps/files_versions/templates/settings.php
+++ b/apps/files_versions/templates/settings.php
@@ -1,6 +1,9 @@
<form id="versionssettings">
<fieldset class="personalblock">
<legend><strong><?php echo $l->t('Files Versioning');?></strong></legend>
- <input type="checkbox" name="versions" id="versions" value="1" <?php if (OCP\Config::getSystemValue('versions', 'true')=='true') echo ' checked="checked"'; ?> /> <label for="versions"><?php echo $l->t('Enable'); ?></label> <br/>
+ <input type="checkbox" name="versions" id="versions" value="1"
+ <?php if (OCP\Config::getSystemValue('versions', 'true')=='true')
+ echo ' checked="checked"';
+ ?> /> <label for="versions"><?php echo $l->t('Enable'); ?></label> <br/>
</fieldset>
</form>