wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1472 from owncloud/files_versions-cleanup

Browse source 
files_versions cleanup
This commit is contained in:
Thomas Müller 2013-02-06 08:53:20 -08:00
commit 81792448ae
6 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/files_versions/ajax/getVersions.php
View file

@ -5,7 +5,7 @@ $userDirectory = "/".OCP\USER::getUser()."/files";
$source = $_GET['source']; $source = $_GET['source'];
$count = 5; //show the newest revisions $count = 5; //show the newest revisions
if( ($versions = OCA_Versions\Storage::getVersions( $source, $count)) ) { if( ($versions = OCA\Files_Versions\Storage::getVersions( $source, $count)) ) {
$versionsFormatted = array(); $versionsFormatted = array();

2
apps/files_versions/ajax/rollbackVersion.php
View file

@ -8,7 +8,7 @@ $userDirectory = "/".OCP\USER::getUser()."/files";
$file = $_GET['file']; $file = $_GET['file'];
$revision=(int)$_GET['revision']; $revision=(int)$_GET['revision'];
if(OCA_Versions\Storage::rollback( $file, $revision )) { if(OCA\Files_Versions\Storage::rollback( $file, $revision )) {
OCP\JSON::success(array("data" => array( "revision" => $revision, "file" => $file ))); OCP\JSON::success(array("data" => array( "revision" => $revision, "file" => $file )));
}else{ }else{
OCP\JSON::error(array("data" => array( "message" => "Could not revert:" . $file ))); OCP\JSON::error(array("data" => array( "message" => "Could not revert:" . $file )));

10
apps/files_versions/appinfo/app.php
View file

@ -1,8 +1,8 @@
<?php <?php
//require_once 'files_versions/versions.php'; //require_once 'files_versions/versions.php';
OC::$CLASSPATH['OCA_Versions\Storage'] = 'apps/files_versions/lib/versions.php'; OC::$CLASSPATH['OCA\Files_Versions\Storage'] = 'apps/files_versions/lib/versions.php';
OC::$CLASSPATH['OCA_Versions\Hooks'] = 'apps/files_versions/lib/hooks.php'; OC::$CLASSPATH['OCA\Files_Versions\Hooks'] = 'apps/files_versions/lib/hooks.php';
OCP\App::registerAdmin('files_versions', 'settings'); OCP\App::registerAdmin('files_versions', 'settings');
OCP\App::registerPersonal('files_versions', 'settings-personal'); OCP\App::registerPersonal('files_versions', 'settings-personal');
@ -10,7 +10,7 @@ OCP\App::registerPersonal('files_versions', 'settings-personal');
OCP\Util::addscript('files_versions', 'versions'); OCP\Util::addscript('files_versions', 'versions');
// Listen to write signals // Listen to write signals
OCP\Util::connectHook('OC_Filesystem', 'write', "OCA_Versions\Hooks", "write_hook"); OCP\Util::connectHook('OC_Filesystem', 'write', "OCA\Files_Versions\Hooks", "write_hook");
// Listen to delete and rename signals // Listen to delete and rename signals
OCP\Util::connectHook('OC_Filesystem', 'post-delete', "OCA_Versions\Hooks", "remove_hook"); OCP\Util::connectHook('OC_Filesystem', 'post-delete', "OCA\Files_Versions\Hooks", "remove_hook");
OCP\Util::connectHook('OC_Filesystem', 'rename', "OCA_Versions\Hooks", "rename_hook"); OCP\Util::connectHook('OC_Filesystem', 'rename', "OCA\Files_Versions\Hooks", "rename_hook");

4
apps/files_versions/history.php
View file

@ -29,7 +29,7 @@ if ( isset( $_GET['path'] ) ) {
$path = $_GET['path']; $path = $_GET['path'];
$tmpl->assign( 'path', $path ); $tmpl->assign( 'path', $path );
$versions = new OCA_Versions\Storage(); $versions = new OCA\Files_Versions\Storage();
// roll back to old version if button clicked // roll back to old version if button clicked
if( isset( $_GET['revert'] ) ) { if( isset( $_GET['revert'] ) ) {
@ -52,7 +52,7 @@ if ( isset( $_GET['path'] ) ) {
// show the history only if there is something to show // show the history only if there is something to show
$count = 999; //show the newest revisions $count = 999; //show the newest revisions
if( ($versions = OCA_Versions\Storage::getVersions( $path, $count)) ) { if( ($versions = OCA\Files_Versions\Storage::getVersions( $path, $count)) ) {
$tmpl->assign( 'versions', array_reverse( $versions ) ); $tmpl->assign( 'versions', array_reverse( $versions ) );

2
apps/files_versions/lib/hooks.php
View file

@ -10,7 +10,7 @@
* This class contains all hooks. * This class contains all hooks.
*/ */
namespace OCA_Versions; namespace OCA\Files_Versions;
class Hooks { class Hooks {

5
apps/files_versions/lib/versions.php
View file

@ -13,7 +13,7 @@
* A class to handle the versioning of files. * A class to handle the versioning of files.
*/ */
namespace OCA_Versions; namespace OCA\Files_Versions;
class Storage { class Storage {
@ -195,6 +195,7 @@ class Storage {
$files_view = new \OC_FilesystemView('/'.$uid.'/files'); $files_view = new \OC_FilesystemView('/'.$uid.'/files');
$local_file = $files_view->getLocalFile($filename); $local_file = $files_view->getLocalFile($filename);
$local_file_md5 = \md5_file( $local_file );
foreach( $matches as $ma ) { foreach( $matches as $ma ) {
$parts = explode( '.v', $ma ); $parts = explode( '.v', $ma );
@ -206,7 +207,7 @@ class Storage {
$versions[$key]['size'] = $versions_fileview->filesize($filename.'.v'.$version); $versions[$key]['size'] = $versions_fileview->filesize($filename.'.v'.$version);
// if file with modified date exists, flag it in array as currently enabled version // if file with modified date exists, flag it in array as currently enabled version
( \md5_file( $ma ) == \md5_file( $local_file ) ? $versions[$key]['fileMatch'] = 1 : $versions[$key]['fileMatch'] = 0 ); ( \md5_file( $ma ) == $local_file_md5 ? $versions[$key]['fileMatch'] = 1 : $versions[$key]['fileMatch'] = 0 );
} }