From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 4 Jun 2012 21:02:05 +0000 (+0200)
Subject: Merge branch 'unstable'
X-Git-Tag: v4.5.0beta1~74^2~424^2~30^2~4
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4a5973662c78eb5769e7b06d7d559572f57e663f;p=nextcloud-server.git

Merge branch 'unstable'

Conflicts:
	apps/files_external/tests/config.php
	apps/files_versions/ajax/getVersions.php
	apps/files_versions/appinfo/app.php
	apps/files_versions/history.php
	apps/files_versions/js/versions.js
	apps/files_versions/templates/history.php
	apps/files_versions/versions.php
	lib/base.php
---

4a5973662c78eb5769e7b06d7d559572f57e663f
diff --cc apps/files/templates/index.php
index c0a40081fe3,1308645746e..3bd5a1ceef4
mode 100644,100755..100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
diff --cc apps/files_versions/ajax/getVersions.php
index 1d107c1bda0,5debb685891..bee60543339
mode 100644,100755..100644
--- a/apps/files_versions/ajax/getVersions.php
+++ b/apps/files_versions/ajax/getVersions.php
@@@ -10,9 -13,16 +10,16 @@@ $source = strip_tags( $source )
  if( OCA_Versions\Storage::isversioned( $source ) ) {
  
  	$count=5; //show the newest revisions
- 	$versions = OCA_Versions\Storage::getversions( $source, $count);
+ 	$versions = OCA_Versions\Storage::getVersions( $source, $count);
+ 	$versionsFormatted = array();
+ 	
+ 	foreach ( $versions AS $version ) {
+ 	
+ 		$versionsFormatted[] = OCP\Util::formatDate( $version );
+ 		
+ 	}
  
 -	$versionsSorted = array_reverse( $versionsFormatted );
 +	$versionsSorted = array_reverse( $versions );
  	
  	if ( !empty( $versionsSorted ) ) {
  		OCP\JSON::encodedPrint($versionsSorted);
diff --cc apps/files_versions/history.php
index 11c07ef86ce,ea272e3735b..cb4726e8d0e
mode 100644,100755..100644
--- a/apps/files_versions/history.php
+++ b/apps/files_versions/history.php
diff --cc apps/files_versions/js/versions.js
index 5e46b2a0eed,eadf7a51039..82d569fa0f6
--- a/apps/files_versions/js/versions.js
+++ b/apps/files_versions/js/versions.js
@@@ -33,8 -24,8 +33,8 @@@ $(document).ready(function()
  });
  
  function createVersionsDropdown(filename, files) {
--	
 -	var historyUrl = OC.linkTo('files_versions', 'history.php?path='+encodeURIComponent( $( '#dir' ).val() ).replace( /%2F/g, '/' )+'/'+encodeURIComponent( filename ) )
++
 +	var historyUrl = OC.linkTo('files_versions', 'history.php') + '?path='+encodeURIComponent( $( '#dir' ).val() ).replace( /%2F/g, '/' )+'/'+encodeURIComponent( filename );
  	
  	var html = '<div id="dropdown" class="drop" data-file="'+files+'">';
  	html += '<div id="private">';
diff --cc apps/files_versions/templates/history.php
index 58fea75a0d0,891a3720e41..13e104152b7
mode 100644,100755..100644
--- a/apps/files_versions/templates/history.php
+++ b/apps/files_versions/templates/history.php
@@@ -22,8 -22,10 +22,10 @@@ if( isset( $_['message'] ) ) 
  	foreach ( $_['versions'] as $v ) {
  	
  		echo ' ';
- 		echo OCP\Util::formatDate( $v );
- 		echo ' <a href="'.OCP\Util::linkTo('files_versions', 'history.php').'?path='.urlencode( $_['path'] ).'&revert='. $v .'" class="button">Revert</a><br /><br />';
+ 		echo OCP\Util::formatDate( $v['version'] );
 -		echo ' <a href="history.php?path='.urlencode( $_['path'] ).'&revert='. $v['version'] .'" class="button">Revert</a>';
++		echo ' <a href="'.OCP\Util::linkTo('files_versions', 'history.php').'?path='.urlencode( $_['path'] ).'&revert='. $v['version'] .'" class="button">Revert</a><br /><br />';
+ 		if ( $v['cur'] ) { echo '  (<b>Current</b>)'; }
+ 		echo '<br /><br />';
  		
  	}
  
diff --cc apps/files_versions/versions.php
index f39b5a7f4eb,b9010182c09..bc579014659
mode 100644,100755..100644
--- a/apps/files_versions/versions.php
+++ b/apps/files_versions/versions.php
@@@ -33,9 -32,9 +32,9 @@@ class Storage 
  
  	const DEFAULTENABLED=true; 
  	const DEFAULTFOLDER='versions'; 
 -	const DEFAULTBLACKLIST='avi mp3 mpg mp4'; 
 +	const DEFAULTBLACKLIST='avi mp3 mpg mp4 ctmp'; 
  	const DEFAULTMAXFILESIZE=1048576; // 10MB 
- 	const DEFAULTMININTERVAL=120; // 2 min
+ 	const DEFAULTMININTERVAL=1; // 2 min
  	const DEFAULTMAXVERSIONS=50; 
  
  	/**
@@@ -69,15 -68,8 +68,15 @@@
  	 */
  	public static function store($filename) {
  		if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
 -			$versionsFolderName=\OCP\Config::getSystemValue('datadirectory').'/'. \OCP\USER::getUser() .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
 -			$filesfoldername=\OCP\Config::getSystemValue('datadirectory').'/'. \OCP\USER::getUser() .'/files';
 +			if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
 +				$pos = strpos($source, '/files', 1);
 +				$uid = substr($source, 1, $pos - 1);
 +				$filename = substr($source, $pos + 6);
 +			} else {
 +				$uid = \OCP\User::getUser();
 +			}
- 			$versionsfoldername=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
++			$versionsFolderName=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
 +			$filesfoldername=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/files';
  			Storage::init();
  
  			// check if filename is a directory
@@@ -101,25 -93,24 +100,25 @@@
  			}
  
  
 -			// check mininterval
 -			$matches=glob($versionsFolderName.$filename.'.v*');
 -			sort($matches);
 -			$parts=explode('.v',end($matches));
 -			if((end($parts)+Storage::DEFAULTMININTERVAL)>time()){
 -				return false;
 +			// check mininterval if the file is being modified by the owner (all shared files should be versioned despite mininterval)
 +			if ($uid == \OCP\User::getUser()) {
- 				$matches=glob($versionsfoldername.'/'.$filename.'.v*');
++				$matches=glob($versionsFolderName.'/'.$filename.'.v*');
 +				sort($matches);
 +				$parts=explode('.v',end($matches));
 +				if((end($parts)+Storage::DEFAULTMININTERVAL)>time()){
 +					return false;
 +				}
  			}
 -			
 +
  
  			// create all parent folders
  			$info=pathinfo($filename);	
- 			if(!file_exists($versionsfoldername.'/'.$info['dirname'])) mkdir($versionsfoldername.'/'.$info['dirname'],0700,true);	
 -			@mkdir($versionsFolderName.$info['dirname'], 0700, true);	
 -
++			if(!file_exists($versionsFolderName.'/'.$info['dirname'])) mkdir($versionsFolderName.'/'.$info['dirname'],0700,true);	
  
  			// store a new version of a file
- 			copy($filesfoldername.'/'.$filename,$versionsfoldername.'/'.$filename.'.v'.time());
 -			copy($filesfoldername.$filename,$versionsFolderName.$filename.'.v'.time());
++			copy($filesfoldername.'/'.$filename,$versionsFolderName.'/'.$filename.'.v'.time());
          
- 			// expire old revisions
+ 			// expire old revisions if necessary
  			Storage::expire($filename);
  		}
  	}
@@@ -131,19 -122,13 +130,19 @@@
  	public static function rollback($filename,$revision) {
  	
  		if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
 -		
 -			$versionsFolderName=\OCP\Config::getSystemValue('datadirectory').'/'. \OCP\USER::getUser() .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
 +			if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
 +				$pos = strpos($source, '/files', 1);
 +				$uid = substr($source, 1, $pos - 1);
 +				$filename = substr($source, $pos + 6);
 +			} else {
 +				$uid = \OCP\User::getUser();
 +			}
- 			$versionsfoldername=\OCP\Config::getSystemValue('datadirectory').'/'.$uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
++			$versionsFolderName=\OCP\Config::getSystemValue('datadirectory').'/'.$uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
  			
 -			$filesfoldername=\OCP\Config::getSystemValue('datadirectory').'/'. \OCP\USER::getUser() .'/files';
 +			$filesfoldername=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/files';
  			
  			// rollback
- 			if ( @copy($versionsfoldername.'/'.$filename.'.v'.$revision,$filesfoldername.'/'.$filename) ) {
 -			if ( @copy($versionsFolderName.$filename.'.v'.$revision,$filesfoldername.$filename) ) {
++			if ( @copy($versionsFolderName.'/'.$filename.'.v'.$revision,$filesfoldername.'/'.$filename) ) {
  			
  				return true;
  				
@@@ -162,17 -147,10 +161,17 @@@
  	 */
  	public static function isversioned($filename) {
  		if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
 -			$versionsFolderName=\OCP\Config::getSystemValue('datadirectory').'/'. \OCP\USER::getUser() .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
 +			if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
 +				$pos = strpos($source, '/files', 1);
 +				$uid = substr($source, 1, $pos - 1);
 +				$filename = substr($source, $pos + 6);
 +			} else {
 +				$uid = \OCP\User::getUser();
 +			}
- 			$versionsfoldername=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
++			$versionsFolderName=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
  
  			// check for old versions
- 			$matches=glob($versionsfoldername.'/'.$filename.'.v*');
 -			$matches=glob($versionsFolderName.$filename.'.v*');
++			$matches=glob($versionsFolderName.'/'.$filename.'.v*');
  			if(count($matches)>1){
  				return true;
  			}else{
@@@ -186,40 -164,74 +185,81 @@@
  
          
          /**
-          * get a list of old versions of a file.
+          * @brief get a list of all available versions of a file in descending chronological order
+          * @param $filename file to find versions of, relative to the user files dir
+          * @param $count number of versions to return
+          * @returns array
           */
-         public static function getversions($filename,$count=0) {
-                 if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
+         public static function getVersions( $filename, $count = 0 ) {
+         
+                 if( \OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true' ) {
+                 
 -			$versionsFolderName = \OCP\Config::getSystemValue('datadirectory').'/'. \OCP\USER::getUser() .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
 +			if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
 +				$pos = strpos($source, '/files', 1);
 +				$uid = substr($source, 1, $pos - 1);
 +				$filename = substr($source, $pos + 6);
 +			} else {
 +				$uid = \OCP\User::getUser();
 +			}
- 			$versionsfoldername=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
- 			$versions=array();         
-  
- 	              // fetch for old versions
- 			$matches=glob($versionsfoldername.'/'.$filename.'.v*');
- 			sort($matches);
- 			foreach($matches as $ma) {
- 				$parts=explode('.v',$ma);
- 				$versions[]=(end($parts));
++			$versionsFolderName = \OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
+ 			$versions = array();         
+ 			
+ 			// fetch for old versions
 -			$matches = glob( $versionsFolderName.$filename.'.v*' );
++			$matches = glob( $versionsFolderName.'/'.$filename.'.v*' );
+ 			
+ 			sort( $matches );
+ 			
+ 			$i = 0;
+ 			
+ 			foreach( $matches as $ma ) {
+ 				
+ 				$i++;
+ 				$versions[$i]['cur'] = 0;
+ 				$parts = explode( '.v', $ma );
+ 				$versions[$i]['version'] = ( end( $parts ) );
+ 				
+ 				// if file with modified date exists, flag it in array as currently enabled version
+ 				$curFile['fileName'] = basename( $parts[0] );
+ 				$curFile['filePath'] = \OCP\Config::getSystemValue('datadirectory').\OC_Filesystem::getRoot().'/'.$curFile['fileName'];
+ 				
+ 				( \md5_file( $ma ) == \md5_file( $curFile['filePath'] ) ? $versions[$i]['fileMatch'] = 1 : $versions[$i]['fileMatch'] = 0 );
+ 				
  			}
  			
+ 			$versions = array_reverse( $versions );
+ 			
+ 			foreach( $versions as $key => $value ) {
+ 				
+ 				// flag the first matched file in array (which will have latest modification date) as current version
+ 				if ( $versions[$key]['fileMatch'] ) {
+ 				
+ 					$versions[$key]['cur'] = 1;
+ 					break;
+ 					
+ 				}
+ 			
+ 			}
+ 			
+ 			$versions = array_reverse( $versions );
+ 			
  			// only show the newest commits
- 			if($count<>0 and (count($versions)>$count)) {
- 				$versions=array_slice($versions,count($versions)-$count);
+ 			if( $count != 0 and ( count( $versions )>$count ) ) {
+ 			
+ 				$versions = array_slice( $versions, count( $versions ) - $count );
+ 				
  			}
  	
- 			return($versions);
+ 			return( $versions );
  
  
-                 }else{
-                         return(array());
+                 } else {
+                 
+ 			// if versioning isn't enabled then return an empty array
+                         return( array() );
+                         
                  }
-         }	
+                 
+         }
  
  
          
@@@ -228,24 -240,23 +268,30 @@@
           */
          public static function expire($filename) {
                  if(\OCP\Config::getSystemValue('files_versions', Storage::DEFAULTENABLED)=='true') {
+ 
 -			$versionsFolderName=\OCP\Config::getSystemValue('datadirectory').'/'. \OCP\USER::getUser() .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
 +			if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
 +				$pos = strpos($source, '/files', 1);
 +				$uid = substr($source, 1, $pos - 1);
 +				$filename = substr($source, $pos + 6);
 +			} else {
 +				$uid = \OCP\User::getUser();
 +			}
- 			$versionsfoldername=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
++			$versionsFolderName=\OCP\Config::getSystemValue('datadirectory').'/'. $uid .'/'.\OCP\Config::getSystemValue('files_versionsfolder', Storage::DEFAULTFOLDER);
  
  			// check for old versions
- 			$matches=glob($versionsfoldername.'/'.$filename.'.v*');
- 			if(count($matches)>\OCP\Config::getSystemValue('files_versionmaxversions', Storage::DEFAULTMAXVERSIONS)){
- 				$numbertodelete=count($matches-\OCP\Config::getSystemValue('files_versionmaxversions', Storage::DEFAULTMAXVERSIONS));
 -			$matches = glob( $versionsFolderName.$filename.'.v*' );
++			$matches = glob( $versionsFolderName.'/'.$filename.'.v*' );
+ 			
+ 			if( count( $matches ) > \OCP\Config::getSystemValue( 'files_versionmaxversions', Storage::DEFAULTMAXVERSIONS ) ) {
+ 			
+ 				$numberToDelete = count( $matches-\OCP\Config::getSystemValue( 'files_versionmaxversions', Storage::DEFAULTMAXVERSIONS ) );
  
  				// delete old versions of a file
- 				$deleteitems=array_slice($matches,0,$numbertodelete);
- 				foreach($deleteitems as $de){
- 					unlink($versionsfoldername.'/'.$filename.'.v'.$de);
+ 				$deleteItems = array_slice( $matches, 0, $numberToDelete );
+ 				
+ 				foreach( $deleteItems as $de ) {
+ 				
 -					unlink( $versionsFolderName.$filename.'.v'.$de );
++					unlink( $versionsFolderName.'/'.$filename.'.v'.$de );
+ 					
  				}
  			}
                  }
diff --cc apps/gallery/ajax/galleryOp.php
index 0cd825f3e50,b49e52f0bd2..b49e52f0bd2
mode 100644,100755..100644
--- a/apps/gallery/ajax/galleryOp.php
+++ b/apps/gallery/ajax/galleryOp.php
diff --cc apps/gallery/ajax/sharing.php
index 1223320120b,304757b9e91..304757b9e91
mode 100644,100755..100644
--- a/apps/gallery/ajax/sharing.php
+++ b/apps/gallery/ajax/sharing.php
diff --cc apps/gallery/index.php
index e47fb3db5d6,a9fe200c4e4..a9fe200c4e4
mode 100644,100755..100644
--- a/apps/gallery/index.php
+++ b/apps/gallery/index.php
diff --cc apps/gallery/lib/album.php
index 5f962f12f12,7b9036742a6..8ac27b1a70d
mode 100644,100755..100644
--- a/apps/gallery/lib/album.php
+++ b/apps/gallery/lib/album.php
diff --cc apps/gallery/lib/photo.php
index 99384af621a,b4b37236b0e..b4b37236b0e
mode 100644,100755..100644
--- a/apps/gallery/lib/photo.php
+++ b/apps/gallery/lib/photo.php
diff --cc apps/gallery/lib/scanner.php
index 7a137cb3f50,e11ba1da454..e11ba1da454
mode 100644,100755..100644
--- a/apps/gallery/lib/scanner.php
+++ b/apps/gallery/lib/scanner.php
diff --cc apps/user_openid/user_openid.php
index 3267db3fa0f,710d400aa57..e228de95e9e
mode 100644,100755..100644
--- a/apps/user_openid/user_openid.php
+++ b/apps/user_openid/user_openid.php
diff --cc core/templates/layout.guest.php
index 7ba7abdbf12,84422a10b18..7f5a4d50fc6
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@@ -10,7 -13,11 +13,10 @@@
  		<script type="text/javascript">
  			var oc_webroot = '<?php echo OC::$WEBROOT; ?>';
  			var oc_appswebroot = '<?php echo OC::$APPSWEBROOT; ?>';
 -			var oc_appswebroot = '<?php echo OC::$APPSWEBROOT; ?>';
  		</script>
+ 		<?php if (!defined('DEBUG') || !DEBUG): ?>
+ 		<script type="text/javascript" src="<?php echo OC_Helper::linkToRemote('core.js', false) ?>"></script>
+ 		<?php endif ?>
  		<?php foreach($_['jsfiles'] as $jsfile): ?>
  			<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
  		<?php endforeach; ?>
diff --cc lib/app.php
index 17e0e479031,8bd095d8c6c..667633e2647
mode 100755,100644..100755
--- a/lib/app.php
+++ b/lib/app.php
@@@ -49,18 -49,38 +49,26 @@@ class OC_App
  	 * if $types is set, only apps of those types will be loaded
  	 */
  	public static function loadApps($types=null){
 -		// Did we already load everything?
 -		if( self::$init ){
 -			return true;
 -		}
 -
 -		// Our very own core apps are hardcoded
 -		foreach( array( 'settings') as $app ){
 -			if(is_null($types)){
 -				require( $app.'/appinfo/app.php' );
 -			}
 -		}
 -
 -		// The rest comes here
 +		// Load the enabled apps here
  		$apps = self::getEnabledApps();
 +		// prevent app.php from printing output
 +		ob_start();
  		foreach( $apps as $app ){
 -			if((is_null($types) or self::isType($app,$types))){
 -				if(is_file(OC::$APPSROOT.'/apps/'.$app.'/appinfo/app.php')){
 -					require( $app.'/appinfo/app.php' );
 -				}
 +			if((is_null($types) or self::isType($app,$types)) && !in_array($app, self::$loadedApps)){
 +				self::loadApp($app);
 +				self::$loadedApps[] = $app;
  			}
  		}
 -
 -		self::$init = true;
 +		ob_end_clean();
  
+ 		if (!defined('DEBUG') || !DEBUG){
+ 			if (is_null($types)) {
+ 				OC_Util::$core_scripts = OC_Util::$scripts;
+ 				OC_Util::$scripts = array();
+ 				OC_Util::$core_styles = OC_Util::$styles;
+ 				OC_Util::$styles = array();
+ 			}
+ 		}
  		// return
  		return true;
  	}
diff --cc lib/group.php
index 7967e1a581b,bc98e877ade..ceee5fa4edb
--- a/lib/group.php
+++ b/lib/group.php
@@@ -228,12 -221,8 +225,9 @@@ class OC_Group 
  	public static function getUserGroups( $uid ){
  		$groups=array();
  		foreach(self::$_usedBackends as $backend){
- 			if(!$backend->implementsActions(OC_GROUP_BACKEND_GET_USER_GROUPS))
- 				continue;
- 
  			$groups=array_merge($backend->getUserGroups($uid),$groups);
  		}
 +		asort($groups);
  		return $groups;
  	}
  
@@@ -246,12 -235,8 +240,9 @@@
  	public static function getGroups(){
  		$groups=array();
  		foreach(self::$_usedBackends as $backend){
- 			if(!$backend->implementsActions(OC_GROUP_BACKEND_GET_GROUPS))
- 				continue;
- 
  			$groups=array_merge($backend->getGroups(),$groups);
  		}
 +		asort($groups);
  		return $groups;
  	}
  	
diff --cc lib/minimizer.php
index 00000000000,2d2708c59e9..9f9ef086c4a
mode 000000,100644..100644
--- a/lib/minimizer.php
+++ b/lib/minimizer.php
@@@ -1,0 -1,39 +1,40 @@@
+ <?php
+ 
+ abstract class OC_Minimizer
+ {
+ 	protected $files = array();
+ 
+ 	protected function appendIfExist($root, $webroot, $file) {
+                 if (is_file($root.'/'.$file)) {
+ 			$this->files[] = array($root, $webroot, $file);
+                         return true;
+                 }
+                 return false;
+ 	}
+ 
+ 	public function getLastModified($files) {
+ 		$last_modified = 0;
+ 		foreach($files as $file_info) {
+ 			$file = $file_info[0] . '/' . $file_info[2];
+ 			$filemtime = filemtime($file);
+ 			if ($filemtime > $last_modified) {
+ 				$last_modified = $filemtime;
+ 			}
+ 		}
+ 		return $last_modified;
+ 	}
+ 
+ 	abstract public function minimizeFiles($files);
+ 
+ 	public function output($files) {
+ 		header('Content-Type: '.$this->contentType);
+ 		OC_Response::enableCaching();
+ 		$last_modified = $this->getLastModified($files);
+ 		OC_Response::setLastModifiedHeader($last_modified);
+ 
+ 		$out = $this->minimizeFiles($files);
++		OC_Response::setETagHeader(md5($out));
+ 		header('Content-Length: '.strlen($out));
+ 		echo $out;
+ 	}
+ }
diff --cc lib/user.php
index 9bfbfd8ee70,ad5198d0374..f1903093d6d
--- a/lib/user.php
+++ b/lib/user.php
@@@ -332,14 -321,11 +330,12 @@@ class OC_User 
  	public static function getUsers(){
  		$users=array();
  		foreach(self::$_usedBackends as $backend){
- 			if($backend->implementsActions(OC_USER_BACKEND_GET_USERS)){
- 				$backendUsers=$backend->getUsers();
- 				if(is_array($backendUsers)){
- 					$users=array_merge($users,$backendUsers);
- 				}
+ 			$backendUsers=$backend->getUsers();
+ 			if(is_array($backendUsers)){
+ 				$users=array_merge($users,$backendUsers);
  			}
  		}
 +		asort($users);
  		return $users;
  	}