diff --git a/apps/files/admin.php b/apps/files/admin.php
index d05eb7267b..b49c0f61a0 100644
--- a/apps/files/admin.php
+++ b/apps/files/admin.php
@@ -23,7 +23,7 @@
 
 
 // Init owncloud
- 
+
 
 OCP\User::checkAdminUser();
 
diff --git a/apps/files/ajax/list.php b/apps/files/ajax/list.php
index 94ddf0364b..2254526231 100644
--- a/apps/files/ajax/list.php
+++ b/apps/files/ajax/list.php
@@ -23,10 +23,10 @@ if($doBreadcrumb) {
 			$breadcrumb[] = array( "dir" => $pathtohere, "name" => $i );
 		}
 	}
-	
+
 	$breadcrumbNav = new OCP\Template( "files", "part.breadcrumb", "" );
 	$breadcrumbNav->assign( "breadcrumb", $breadcrumb );
-	
+
 	$data['breadcrumb'] = $breadcrumbNav->fetchPage();
 }
 
diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php
index 6ae9c44542..4619315ce0 100644
--- a/apps/files/ajax/newfile.php
+++ b/apps/files/ajax/newfile.php
@@ -39,7 +39,7 @@ function progress($notification_code, $severity, $message, $message_code, $bytes
 		case STREAM_NOTIFY_FILE_SIZE_IS:
 			$filesize = $bytes_max;
 			break;
-			
+
 		case STREAM_NOTIFY_PROGRESS:
 			if ($bytes_transferred > 0) {
 				if (!isset($filesize)) {
diff --git a/apps/files/ajax/rawlist.php b/apps/files/ajax/rawlist.php
index 20094563b1..e0aa0bdac5 100644
--- a/apps/files/ajax/rawlist.php
+++ b/apps/files/ajax/rawlist.php
@@ -11,7 +11,7 @@ OCP\JSON::checkLoggedIn();
 
 // Load the files
 $dir = isset( $_GET['dir'] ) ? $_GET['dir'] : '';
-$mimetype = isset($_GET['mimetype']) ? $_GET['mimetype'] : ''; 
+$mimetype = isset($_GET['mimetype']) ? $_GET['mimetype'] : '';
 
 // make filelist
 $files = array();
diff --git a/apps/files/ajax/scan.php b/apps/files/ajax/scan.php
index 23d7da44f8..d2ec1ab516 100644
--- a/apps/files/ajax/scan.php
+++ b/apps/files/ajax/scan.php
@@ -16,13 +16,12 @@ session_write_close();
 if($force or !OC_FileCache::inCache('')) {
 	if(!$checkOnly) {
 		OCP\DB::beginTransaction();
-		
+
 		if(OC_Cache::isFast()) {
-			//make sure the old fileid's don't mess things up
-			OC_Cache::clear('fileid/');
+			OC_Cache::clear('fileid/'); //make sure the old fileid's don't mess things up
 		}
-		
-		OC_FileCache::scan($dir, $eventSource);
+
+		OC_FileCache::scan($dir,$eventSource);
 		OC_FileCache::clean();
 		OCP\DB::commit();
 		$eventSource->send('success', true);
diff --git a/apps/files/ajax/timezone.php b/apps/files/ajax/timezone.php
index 0be441a36a..b71fa3940c 100644
--- a/apps/files/ajax/timezone.php
+++ b/apps/files/ajax/timezone.php
@@ -3,4 +3,3 @@
 	// see lib/base.php for an example
 	//session_start();
 	$_SESSION['timezone'] = $_GET['time'];
-        
\ No newline at end of file
diff --git a/apps/files/appinfo/update.php b/apps/files/appinfo/update.php
index b2480a58f5..32ac89f006 100644
--- a/apps/files/appinfo/update.php
+++ b/apps/files/appinfo/update.php
@@ -41,5 +41,3 @@ foreach($filesToRemove as $file) {
 		break;
     }
 }
-
-
diff --git a/apps/files/download.php b/apps/files/download.php
index 4e2478d1ad..44a328e25d 100644
--- a/apps/files/download.php
+++ b/apps/files/download.php
@@ -22,7 +22,7 @@
 */
 
 // Init owncloud
- 
+
 
 // Check if we are a user
 OCP\User::checkLoggedIn();
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 049afea4f6..b57e75c900 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -379,7 +379,7 @@ $(document).ready(function() {
 			stop: function(e, data) {
 				if(data.dataType != 'iframe ') {
 					$('#upload input.stop').hide();
-				}	
+				}
 				$('#uploadprogressbar').progressbar('value',100);
 				$('#uploadprogressbar').fadeOut();
 			}
@@ -542,7 +542,7 @@ $(document).ready(function() {
 			scanFiles();
 		}
 	}, "json");
-	
+
 	var lastWidth = 0;
 	var breadcrumbs = [];
 	var breadcrumbsWidth = $('#navigation').get(0).offsetWidth;
@@ -603,7 +603,7 @@ $(document).ready(function() {
 	$(window).resize(function() {
 		resizeBreadcrumbs(false);
 	});
-	
+
 	resizeBreadcrumbs(true);
 });
 
diff --git a/apps/files/settings.php b/apps/files/settings.php
index cd6dd8c161..b02c3738c6 100644
--- a/apps/files/settings.php
+++ b/apps/files/settings.php
@@ -23,7 +23,7 @@
 
 
 // Init owncloud
- 
+
 
 // Check if we are a user
 OCP\User::checkLoggedIn();
diff --git a/apps/files/templates/admin.php b/apps/files/templates/admin.php
index 23021ec664..3ad0629750 100644
--- a/apps/files/templates/admin.php
+++ b/apps/files/templates/admin.php
@@ -14,6 +14,3 @@
 		<input type="submit" name="submitFilesAdminSettings" id="submitFilesAdminSettings" value="Save"/>
 	</fieldset>
 </form>
-
-
-
diff --git a/apps/files_encryption/js/settings.js b/apps/files_encryption/js/settings.js
index 8cc433246c..a160b9e0e1 100644
--- a/apps/files_encryption/js/settings.js
+++ b/apps/files_encryption/js/settings.js
@@ -11,7 +11,7 @@ $(document).ready(function(){
 		onuncheck:blackListChange,
 		createText:'...',
 	});
-	
+
 	function blackListChange(){
 		var blackList=$('#encryption_blacklist').val().join(',');
 		OC.AppConfig.setValue('files_encryption','type_blacklist',blackList);
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 849e88ee0b..0770bca018 100644
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -188,7 +188,7 @@ class OC_Crypt {
 			fclose($handleread);
 		}
 	}
-	
+
 	/**
 	 * encrypt data in 8192b sized blocks
 	 */
@@ -200,7 +200,7 @@ class OC_Crypt {
 		}
 		return $result;
 	}
-	
+
 	/**
 	 * decrypt data in 8192b sized blocks
 	 */
diff --git a/apps/files_encryption/lib/cryptstream.php b/apps/files_encryption/lib/cryptstream.php
index 46471911d9..75ad62659d 100644
--- a/apps/files_encryption/lib/cryptstream.php
+++ b/apps/files_encryption/lib/cryptstream.php
@@ -64,16 +64,16 @@ class OC_CryptStream{
 		}
 		return is_resource($this->source);
 	}
-	
+
 	public function stream_seek($offset, $whence=SEEK_SET){
 		$this->flush();
 		fseek($this->source,$offset,$whence);
 	}
-	
+
 	public function stream_tell(){
 		return ftell($this->source);
 	}
-	
+
 	public function stream_read($count){
 		//$count will always be 8192 https://bugs.php.net/bug.php?id=21641
 		//This makes this function a lot simpler but will breake everything the moment it's fixed
@@ -95,7 +95,7 @@ class OC_CryptStream{
 		}
 		return $result;
 	}
-	
+
 	public function stream_write($data){
 		$length=strlen($data);
 		$currentPos=ftell($this->source);
@@ -143,11 +143,11 @@ class OC_CryptStream{
 	public function stream_stat(){
 		return fstat($this->source);
 	}
-	
+
 	public function stream_lock($mode){
 		flock($this->source,$mode);
 	}
-	
+
 	public function stream_flush(){
 		return fflush($this->source);
 	}
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index f25e4a662f..247924b2aa 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -28,7 +28,7 @@
 class OC_FileProxy_Encryption extends OC_FileProxy{
 	private static $blackList=null; //mimetypes blacklisted from encryption
 	private static $enableEncryption=null;
-	
+
 	/**
 	 * check if a file should be encrypted during write
 	 * @param string $path
@@ -62,7 +62,7 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
 		$metadata=OC_FileCache_Cached::get($path,'');
 		return isset($metadata['encrypted']) and (bool)$metadata['encrypted'];
 	}
-	
+
 	public function preFile_put_contents($path,&$data){
 		if(self::shouldEncrypt($path)){
 			if (!is_resource($data)) {//stream put contents should have been converter to fopen
@@ -72,7 +72,7 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
 			}
 		}
 	}
-	
+
 	public function postFile_get_contents($path,$data){
 		if(self::isEncrypted($path)){
 			$cached=OC_FileCache_Cached::get($path,'');
@@ -80,7 +80,7 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
 		}
 		return $data;
 	}
-	
+
 	public function postFopen($path,&$result){
 		if(!$result){
 			return $result;
diff --git a/apps/files_encryption/tests/encryption.php b/apps/files_encryption/tests/encryption.php
index 286770a69f..f70411ed63 100644
--- a/apps/files_encryption/tests/encryption.php
+++ b/apps/files_encryption/tests/encryption.php
@@ -23,7 +23,7 @@ class Test_Encryption extends UnitTestCase {
 		$decrypted=OC_Crypt::decrypt($encrypted,$key);
 		$decrypted=rtrim($decrypted, "\0");
 		$this->assertEqual($decrypted,$chunk);
-		
+
 		$encrypted=OC_Crypt::blockEncrypt($source,$key);
 		$decrypted=OC_Crypt::blockDecrypt($encrypted,$key);
 		$this->assertNotEqual($encrypted,$source);
@@ -56,7 +56,7 @@ class Test_Encryption extends UnitTestCase {
 
 	function testBinary(){
 		$key=uniqid();
-	
+
 		$file=__DIR__.'/binary';
 		$source=file_get_contents($file); //binary file
 		$encrypted=OC_Crypt::encrypt($source,$key);
diff --git a/apps/files_encryption/tests/proxy.php b/apps/files_encryption/tests/proxy.php
index 5463836a20..c4952d13d3 100644
--- a/apps/files_encryption/tests/proxy.php
+++ b/apps/files_encryption/tests/proxy.php
@@ -9,18 +9,18 @@
 class Test_CryptProxy extends UnitTestCase {
 	private $oldConfig;
 	private $oldKey;
-	
+
 	public function setUp(){
 		$user=OC_User::getUser();
 
 		$this->oldConfig=OCP\Config::getAppValue('files_encryption','enable_encryption','true');
 		OCP\Config::setAppValue('files_encryption','enable_encryption','true');
 		$this->oldKey=isset($_SESSION['enckey'])?$_SESSION['enckey']:null;
-	
-		
+
+
 		//set testing key
 		$_SESSION['enckey']=md5(time());
-	
+
 		//clear all proxies and hooks so we can do clean testing
 		OC_FileProxy::clearProxies();
 		OC_Hook::clear('OC_Filesystem');
@@ -52,11 +52,11 @@ class Test_CryptProxy extends UnitTestCase {
 		$original=file_get_contents($file);
 
 		OC_Filesystem::file_put_contents('/file',$original);
-		
+
 		OC_FileProxy::$enabled=false;
 		$stored=OC_Filesystem::file_get_contents('/file');
 		OC_FileProxy::$enabled=true;
-		
+
 		$fromFile=OC_Filesystem::file_get_contents('/file');
 		$this->assertNotEqual($original,$stored);
 		$this->assertEqual(strlen($original),strlen($fromFile));
diff --git a/apps/files_encryption/tests/stream.php b/apps/files_encryption/tests/stream.php
index d95ea792f7..517d497344 100644
--- a/apps/files_encryption/tests/stream.php
+++ b/apps/files_encryption/tests/stream.php
@@ -8,7 +8,7 @@
 
 class Test_CryptStream extends UnitTestCase {
 	private $tmpFiles=array();
-	
+
 	function testStream(){
 		$stream=$this->getStream('test1','w',strlen('foobar'));
 		fwrite($stream,'foobar');
diff --git a/apps/files_external/ajax/addRootCertificate.php b/apps/files_external/ajax/addRootCertificate.php
index d28a7d24b2..1aa40bd8aa 100644
--- a/apps/files_external/ajax/addRootCertificate.php
+++ b/apps/files_external/ajax/addRootCertificate.php
@@ -14,7 +14,7 @@ $fh = fopen($to, 'r');
 $data = fread($fh, filesize($to));
 fclose($fh);
 if (!strpos($data, 'BEGIN CERTIFICATE')) {
-	$pem = chunk_split(base64_encode($data), 64, "\n");
+	$pem = chunk_split(base64_encode($data), 64, "\n");
 	$pem = "-----BEGIN CERTIFICATE-----\n".$pem."-----END CERTIFICATE-----\n";
 	$fh = fopen($to, 'w');
 	fwrite($fh, $pem);
diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index 23f02bbefc..f346007090 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -70,7 +70,7 @@ OC.MountConfig={
 
 $(document).ready(function() {
 	$('.chzn-select').chosen();
-	
+
 	$('#selectBackend').live('change', function() {
 		var tr = $(this).parent().parent();
 		$('#externalStorage tbody').append($(tr).clone());
@@ -133,7 +133,7 @@ $(document).ready(function() {
 			}
 		}
 		return defaultMountPoint+append;
-	} 
+	}
 
 	$('#externalStorage td').live('change', function() {
 		OC.MountConfig.saveStorage($(this).parent());
diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index 3c2e333017..34f8ba2557 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -29,7 +29,7 @@ class OC_Filestorage_AmazonS3 extends OC_Filestorage_Common {
 	private $objects = array();
 
 	private static $tempFiles = array();
-	
+
 	// TODO options: storage class, encryption server side, encrypt before upload?
 
 	public function __construct($params) {
@@ -216,7 +216,7 @@ class OC_Filestorage_AmazonS3 extends OC_Filestorage_Common {
 	}
 
 	public function free_space($path) {
-		// Infinite? 
+		// Infinite?
 		return false;
 	}
 
diff --git a/apps/files_external/lib/ftp.php b/apps/files_external/lib/ftp.php
index 63f14a2877..818273f6c2 100644
--- a/apps/files_external/lib/ftp.php
+++ b/apps/files_external/lib/ftp.php
@@ -14,7 +14,7 @@ class OC_FileStorage_FTP extends OC_FileStorage_StreamWrapper{
 	private $root;
 
 	private static $tempFiles=array();
-	
+
 	public function __construct($params){
 		$this->host=$params['host'];
 		$this->user=$params['user'];
diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
index 73317bbf71..9b83dcee53 100644
--- a/apps/files_external/lib/google.php
+++ b/apps/files_external/lib/google.php
@@ -119,7 +119,7 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
 				}
 			}
 		}
-		return false; 
+		return false;
 	}
 
 	private function getFeed($feedUri, $httpMethod, $postData = null) {
@@ -174,7 +174,7 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
 				return 'html';
 		}
 	}
-	
+
 
 	public function mkdir($path) {
 		$collection = dirname($path);
@@ -254,7 +254,7 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
 		} else if ($entry = $this->getResource($path)) {
 			// NOTE: Native resources don't have a file size
 			$stat['size'] = $entry->getElementsByTagNameNS('http://schemas.google.com/g/2005', 'quotaBytesUsed')->item(0)->nodeValue;
-// 			if (isset($atime = $entry->getElementsByTagNameNS('http://schemas.google.com/g/2005', 'lastViewed')->item(0)->nodeValue)) 
+// 			if (isset($atime = $entry->getElementsByTagNameNS('http://schemas.google.com/g/2005', 'lastViewed')->item(0)->nodeValue))
 // 			$stat['atime'] = strtotime($entry->getElementsByTagNameNS('http://schemas.google.com/g/2005', 'lastViewed')->item(0)->nodeValue);
 			$stat['mtime'] = strtotime($entry->getElementsByTagName('updated')->item(0)->nodeValue);
 			$stat['ctime'] = strtotime($entry->getElementsByTagName('published')->item(0)->nodeValue);
@@ -304,7 +304,7 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
 		}
 		return false;
 	}
-	
+
 	public function file_exists($path) {
 		if ($path == '' || $path == '/') {
 			return true;
@@ -313,7 +313,7 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
 		}
 		return false;
 	}
-	
+
 	public function unlink($path) {
 		// Get resource self link to trash resource
 		if ($entry = $this->getResource($path)) {
@@ -482,7 +482,7 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
 			// TODO Wait for resource entry
 		}
 	}
-	
+
 	public function getMimeType($path, $entry = null) {
 		// Entry can be passed, because extension is required for opendir and the entry can't be cached without the extension
 		if ($entry == null) {
@@ -522,7 +522,7 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
 		}
 		return false;
 	}
-	
+
 	public function free_space($path) {
 		if ($dom = $this->getFeed('https://docs.google.com/feeds/metadata/default', 'GET')) {
 			// NOTE: Native Google Docs resources don't count towards quota
@@ -532,9 +532,9 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
 		}
 		return false;
 	}
-  
+
 	public function touch($path, $mtime = null) {
-	  
+
 	}
 
 }
\ No newline at end of file
diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php
index 94ccde1ff8..1868bc4ba7 100644
--- a/apps/files_external/lib/swift.php
+++ b/apps/files_external/lib/swift.php
@@ -274,7 +274,7 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
 		}
 		$this->auth = new CF_Authentication($this->user, $this->token, null, $this->host);
 		$this->auth->authenticate();
-		
+
 		$this->conn = new CF_Connection($this->auth);
 
 		if(!$this->containerExists($this->root)){
@@ -303,7 +303,7 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
 				$parentContainer=$this->getContainer(dirname($path));
 				$this->removeSubContainer($parentContainer,basename($path));
 			}
-			
+
 			$this->conn->delete_container($this->getContainerName($path));
 			unset($this->containers[$path]);
 			return true;
@@ -410,7 +410,7 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
 			case 'rb':
 				$fp = fopen('php://temp', 'r+');
 				$obj->stream($fp);
-				
+
 				rewind($fp);
 				return $fp;
 			case 'w':
@@ -451,7 +451,7 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
 		if(is_null($mtime)){
 			$mtime=time();
 		}
-		
+
 		//emulate setting mtime with metadata
 		$obj->metadata['Mtime']=$mtime;
 		$obj->sync_metadata();
diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php
index e3f73c5c0a..1b9c3e3333 100644
--- a/apps/files_external/lib/webdav.php
+++ b/apps/files_external/lib/webdav.php
@@ -18,7 +18,7 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
 	private $client;
 
 	private static $tempFiles=array();
-	
+
 	public function __construct($params){
 		$host = $params['host'];
 		//remove leading http[s], will be generated in createBaseUri()
@@ -35,7 +35,7 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
 		if(substr($this->root,-1,1)!='/'){
 			$this->root.='/';
 		}
-		
+
 		$settings = array(
 			'baseUri' => $this->createBaseUri(),
 			'userName' => $this->user,
@@ -43,7 +43,7 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
 		);
 
 		$this->client = new OC_Connector_Sabre_Client($settings);
-		
+
 		if($caview = \OCP\Files::getStorage('files_external')) {
 			$certPath=\OCP\Config::getSystemValue('datadirectory').$caview->getAbsolutePath("").'rootcerts.crt';
 			if (file_exists($certPath))  {
@@ -296,4 +296,3 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
 		}
 	}
 }
-
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index 397f0d951b..7da9613572 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -80,7 +80,7 @@
 			</tbody>
 		</table>
 		<br />
-		
+
 		<?php if (!$_['isAdminPage']):  ?>
   		<table id="sslCertificate" data-admin='<?php echo json_encode($_['isAdminPage']); ?>'>
 			<thead>
@@ -91,17 +91,17 @@
 			</thead>
 			<tbody width="100%">
 			<?php foreach ($_['certs'] as $rootCert): ?>
-			<tr id="<?php echo $rootCert ?>">	
+			<tr id="<?php echo $rootCert ?>">
 			<td class="rootCert"><?php echo $rootCert ?></td>
 			<td <?php echo ($rootCert != '') ? 'class="remove"' : 'style="visibility:hidden;"'; ?>><img alt="<?php echo $l->t('Delete'); ?>" title="<?php echo $l->t('Delete'); ?>" class="svg action" src="<?php echo image_path('core', 'actions/delete.svg'); ?>" /></td>
 			</tr>
 			<?php endforeach; ?>
 			</tbody>
-		</table>		
+		</table>
         <input type="file" id="rootcert_import" name="rootcert_import" style="width:230px;">
-        <input type="submit" name="cert_import" value="<?php echo $l->t('Import Root Certificate'); ?>" />		
+        <input type="submit" name="cert_import" value="<?php echo $l->t('Import Root Certificate'); ?>" />
 		<?php endif; ?>
-		
+
 		<?php if ($_['isAdminPage']): ?>
 			<br />
 			<input type="checkbox" name="allowUserMounting" id="allowUserMounting" value="1" <?php if ($_['allowUserMounting'] == 'yes') echo ' checked="checked"'; ?> />
diff --git a/apps/files_external/tests/ftp.php b/apps/files_external/tests/ftp.php
index 97796bca12..3548880e83 100644
--- a/apps/files_external/tests/ftp.php
+++ b/apps/files_external/tests/ftp.php
@@ -5,7 +5,7 @@
  * later.
  * See the COPYING-README file.
  */
- 
+
 $config=include('apps/files_external/tests/config.php');
 if(!is_array($config) or !isset($config['ftp']) or !$config['ftp']['run']){
 	abstract class Test_Filestorage_FTP extends Test_FileStorage{}
@@ -26,4 +26,3 @@ if(!is_array($config) or !isset($config['ftp']) or !$config['ftp']['run']){
 		}
 	}
 }
-
diff --git a/apps/files_external/tests/google.php b/apps/files_external/tests/google.php
index 806db5a6aa..b0bd9cbbea 100644
--- a/apps/files_external/tests/google.php
+++ b/apps/files_external/tests/google.php
@@ -26,7 +26,7 @@ if(!is_array($config) or !isset($config['google']) or !$config['google']['run'])
 	return;
 }else{
 	class Test_Filestorage_Google extends Test_FileStorage {
-		
+
 		private $config;
 
 		public function setUp(){
@@ -41,4 +41,3 @@ if(!is_array($config) or !isset($config['google']) or !$config['google']['run'])
 		}
 	}
 }
-
diff --git a/apps/files_external/tests/swift.php b/apps/files_external/tests/swift.php
index 1520c9473d..bfe7b77aac 100644
--- a/apps/files_external/tests/swift.php
+++ b/apps/files_external/tests/swift.php
@@ -21,11 +21,10 @@ if(!is_array($config) or !isset($config['swift']) or !$config['swift']['run']){
 			$this->instance=new OC_Filestorage_SWIFT($this->config['swift']);
 		}
 
-		
+
 		public function tearDown(){
 		    $this->instance->rmdir('');
 		}
-		
+
 	}
 }
-
diff --git a/apps/files_external/tests/webdav.php b/apps/files_external/tests/webdav.php
index 14abbef2cb..49c44124f3 100644
--- a/apps/files_external/tests/webdav.php
+++ b/apps/files_external/tests/webdav.php
@@ -26,4 +26,3 @@ if(!is_array($config) or !isset($config['webdav']) or !$config['webdav']['run'])
 		}
 	}
 }
-
diff --git a/apps/files_sharing/appinfo/update.php b/apps/files_sharing/appinfo/update.php
index b43269d69f..feafa5fb99 100644
--- a/apps/files_sharing/appinfo/update.php
+++ b/apps/files_sharing/appinfo/update.php
@@ -4,13 +4,13 @@
 $datadir = \OCP\Config::getSystemValue('datadirectory');
 $currentVersion=OC_Appconfig::getValue('files_sharing', 'installed_version');
 if (version_compare($currentVersion, '0.2.2', '<')) {
-	if ($handle = opendir($datadir)) {
-		while (false !== ($entry = readdir($handle))) {
-			$sharedFolder = $datadir.'/'.$entry.'/files/Shared';
-			if ($entry != "." && $entry != ".." && is_dir($sharedFolder)) {
-				touch($sharedFolder);
-			}
-		}
-		closedir($handle);
+	if ($handle = opendir($datadir)) {
+		while (false !== ($entry = readdir($handle))) {
+			$sharedFolder = $datadir.'/'.$entry.'/files/Shared';
+			if ($entry != "." && $entry != ".." && is_dir($sharedFolder)) {
+				touch($sharedFolder);
+			}
+		}
+		closedir($handle);
 	}
 }
\ No newline at end of file
diff --git a/apps/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php
index 5005d9a39d..b1e3ca8b48 100644
--- a/apps/files_sharing/lib/share/file.php
+++ b/apps/files_sharing/lib/share/file.php
@@ -27,7 +27,7 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
 	const FORMAT_OPENDIR = 3;
 
 	private $path;
-	
+
 	public function isValidSource($itemSource, $uidOwner) {
 		$path = OC_FileCache::getPath($itemSource, $uidOwner);
 		if (OC_Filesystem::file_exists($path)) {
@@ -94,7 +94,7 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
 				$files[] = basename($item['file_target']);
 			}
 			return $files;
-		} 
+		}
 		return array();
 	}
 
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index a3a8750d27..df5d4d20ae 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -24,10 +24,10 @@
  * Convert target path to source path and pass the function call to the correct storage provider
  */
 class OC_Filestorage_Shared extends OC_Filestorage_Common {
-	
+
 	private $sharedFolder;
 	private $files = array();
-	
+
 	public function __construct($arguments) {
 		$this->sharedFolder = $arguments['sharedFolder'];
 		OC_Util::setupFS4all();
@@ -106,17 +106,17 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		$internalPath = substr($path, strlen($mountPoint));
 		return $internalPath;
 	}
-	
+
 	public function mkdir($path) {
 		if ($path == '' || $path == '/' || !$this->isCreatable(dirname($path))) {
-			return false; 
+			return false;
 		} else if ($source = $this->getSourcePath($path)) {
 			$storage = OC_Filesystem::getStorage($source);
 			return $storage->mkdir($this->getInternalPath($source));
 		}
 		return false;
 	}
-	
+
 	public function rmdir($path) {
 		if (($source = $this->getSourcePath($path)) && $this->isDeletable($path)) {
 			$storage = OC_Filesystem::getStorage($source);
@@ -124,7 +124,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		}
 		return false;
 	}
-	
+
 	public function opendir($path) {
 		if ($path == '' || $path == '/') {
 			$files = OCP\Share::getItemsSharedWith('file', OC_Share_Backend_Folder::FORMAT_OPENDIR);
@@ -229,10 +229,10 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		}
 		return false;
 	}
-	
+
 	public function filectime($path) {
 		if ($path == '' || $path == '/') {
-			$ctime = 0; 
+			$ctime = 0;
 			if ($dh = $this->opendir($path)) {
 				while (($filename = readdir($dh)) !== false) {
 					$tempctime = $this->filectime($filename);
@@ -250,10 +250,10 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 			}
 		}
 	}
-	
+
 	public function filemtime($path) {
 		if ($path == '' || $path == '/') {
-			$mtime = 0; 
+			$mtime = 0;
 			if ($dh = $this->opendir($path)) {
 				while (($filename = readdir($dh)) !== false) {
 					$tempmtime = $this->filemtime($filename);
@@ -271,7 +271,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 			}
 		}
 	}
-	
+
 	public function file_get_contents($path) {
 		$source = $this->getSourcePath($path);
 		if ($source) {
@@ -284,7 +284,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 			return $storage->file_get_contents($this->getInternalPath($source));
 		}
 	}
-	
+
 	public function file_put_contents($path, $data) {
 		if ($source = $this->getSourcePath($path)) {
 			// Check if permission is granted
@@ -302,7 +302,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		}
 		return false;
 	}
-	
+
 	public function unlink($path) {
 		// Delete the file if DELETE permission is granted
 		if (($source = $this->getSourcePath($path)) && $this->isDeletable($path)) {
@@ -311,7 +311,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		}
 		return false;
 	}
-	
+
 	public function rename($path1, $path2) {
 		// Renaming/moving is only allowed within shared folders
 		$pos1 = strpos($path1, '/', 1);
@@ -344,7 +344,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		}
 		return false;
 	}
-	
+
 	public function copy($path1, $path2) {
 		// Copy the file if CREATE permission is granted
 		if ($this->isCreatable(dirname($path2))) {
diff --git a/apps/files_versions/ajax/expireAll.php b/apps/files_versions/ajax/expireAll.php
index 2a678c7f0a..f76da3da98 100644
--- a/apps/files_versions/ajax/expireAll.php
+++ b/apps/files_versions/ajax/expireAll.php
@@ -32,13 +32,13 @@ OCP\JSON::callCheck();
 $versions = new OCA_Versions\Storage();
 
 if( $versions->expireAll() ){
-	
+
 	OCP\JSON::success();
 	die();
-	
+
 } else {
-	
+
 	OCP\JSON::error();
 	die();
-	
+
 }
\ No newline at end of file
diff --git a/apps/files_versions/ajax/getVersions.php b/apps/files_versions/ajax/getVersions.php
index 1a0e21732c..8476e5e8a5 100644
--- a/apps/files_versions/ajax/getVersions.php
+++ b/apps/files_versions/ajax/getVersions.php
@@ -9,19 +9,19 @@ if( OCA_Versions\Storage::isversioned( $source ) ) {
 	$count=5; //show the newest revisions
 	$versions = OCA_Versions\Storage::getVersions( $source, $count);
 	$versionsFormatted = array();
-	
+
 	foreach ( $versions AS $version ) {
 		$versionsFormatted[] = OCP\Util::formatDate( $version['version'] );
 	}
 
 	$versionsSorted = array_reverse( $versions );
-	
+
 	if ( !empty( $versionsSorted ) ) {
 		OCP\JSON::encodedPrint($versionsSorted);
 	}
-	
+
 } else {
 
 	return;
-	
+
 }
diff --git a/apps/files_versions/appinfo/update.php b/apps/files_versions/appinfo/update.php
index 9569ca1048..e289b927b3 100644
--- a/apps/files_versions/appinfo/update.php
+++ b/apps/files_versions/appinfo/update.php
@@ -6,11 +6,11 @@ if (version_compare($installedVersion, '1.0.2', '<')) {
 	$users = \OCP\User::getUsers();
 	$datadir =  \OCP\Config::getSystemValue('datadirectory').'/';
     foreach ($users as $user) {
-    	$oldPath = $datadir.$user.'/versions';
+    	$oldPath = $datadir.$user.'/versions';
     	$newPath = $datadir.$user.'/files_versions';
     	if(is_dir($oldPath)) {
     		rename($oldPath, $newPath);
     	}
     }
-	
+
 }
diff --git a/apps/files_versions/history.php b/apps/files_versions/history.php
index 27dc8bfc38..ea36d6d9f8 100644
--- a/apps/files_versions/history.php
+++ b/apps/files_versions/history.php
@@ -5,20 +5,20 @@
  *
  * @author Frank Karlitschek
  * @copyright 2012 Frank Karlitschek frank@owncloud.org
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either 
+ * License as published by the Free Software Foundation; either
  * version 3 of the License, or any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *  
- * You should have received a copy of the GNU Lesser General Public 
+ *
+ * You should have received a copy of the GNU Lesser General Public
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
- * 
+ *
  */
 
 OCP\User::checkLoggedIn( );
@@ -34,40 +34,40 @@ if ( isset( $_GET['path'] ) ) {
 
 	// roll back to old version if button clicked
         if( isset( $_GET['revert'] ) ) {
-        	
+
         	if( $versions->rollback( $path, $_GET['revert'] ) ) {
-			
+
 			$tmpl->assign( 'outcome_stat', 'success' );
-			
+
 			$tmpl->assign( 'outcome_msg', "File {$_GET['path']} was reverted to version ".OCP\Util::formatDate( doubleval($_GET['revert']) ) );
-			
+
 		} else {
-		
+
 			$tmpl->assign( 'outcome_stat', 'failure' );
-		
+
 			$tmpl->assign( 'outcome_msg', "File {$_GET['path']} could not be reverted to version ".OCP\Util::formatDate( doubleval($_GET['revert']) ) );
-			
+
 		}
-		
+
 	}
 
 	// show the history only if there is something to show
         if( OCA_Versions\Storage::isversioned( $path ) ) {
-	
+
 		$count = 999; //show the newest revisions
 	        $versions = OCA_Versions\Storage::getVersions( $path, $count);
 
 		$tmpl->assign( 'versions', array_reverse( $versions ) );
-		
+
 	}else{
-		
+
 		$tmpl->assign( 'message', 'No old versions available' );
-		
+
 	}
 }else{
-	
+
 	$tmpl->assign( 'message', 'No path specified' );
-	
+
 }
 
 $tmpl->printPage( );
diff --git a/apps/files_versions/js/settings-personal.js b/apps/files_versions/js/settings-personal.js
index 6ea8c1a950..1e6b036fda 100644
--- a/apps/files_versions/js/settings-personal.js
+++ b/apps/files_versions/js/settings-personal.js
@@ -2,16 +2,16 @@
 
 $( document ).ready(function(){
 	//
-	$( '#expireAllBtn' ).click( 
-		
+	$( '#expireAllBtn' ).click(
+
 		function( event ) {
-		
+
 			// Prevent page from reloading
 			event.preventDefault();
-			
+
 			// Show loading gif
 			$('.expireAllLoading').show();
-		
+
 			$.getJSON(
 				OC.filePath('files_versions','ajax','expireAll.php'),
 				function(result){
@@ -19,20 +19,20 @@ $( document ).ready(function(){
 						$('.expireAllLoading').hide();
 						$('#expireAllBtn').html('Expiration successful');
 					} else {
-						
+
 						// Cancel loading
 						$('#expireAllBtn').html('Expiration failed');
-						
+
 						// Show Dialog
 						OC.dialogs.alert(
-							'Something went wrong, your files may not have been expired', 
-							'An error has occurred', 
-							function(){ 
-								$('#expireAllBtn').html(t('files_versions', 'Expire all versions')+'<img style="display: none;" class="loading" src="'+OC.filePath('core','img','loading.gif')+'" />'); 
-							}	
-						);		
+							'Something went wrong, your files may not have been expired',
+							'An error has occurred',
+							function(){
+								$('#expireAllBtn').html(t('files_versions', 'Expire all versions')+'<img style="display: none;" class="loading" src="'+OC.filePath('core','img','loading.gif')+'" />');
+							}
+						);
 					}
-				}	
+				}
 			);
 		}
 	);
diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js
index c5c1553f1a..e34a6f50ca 100644
--- a/apps/files_versions/js/versions.js
+++ b/apps/files_versions/js/versions.js
@@ -14,7 +14,7 @@ $(document).ready(function(){
 		FileActions.register('file','History', FileActions.PERMISSION_UPDATE, function(){return OC.imagePath('core','actions/history')},function(filename){
 
 			if (scanFiles.scanning){return;}//workaround to prevent additional http request block scanning feedback
-			
+
 			var file = $('#dir').val()+'/'+filename;
 			// Check if drop down is already visible for a different file
 			if (($('#dropdown').length > 0)) {
@@ -35,7 +35,7 @@ $(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 html = '<div id="dropdown" class="drop" data-file="'+files+'">';
 	html += '<div id="private">';
 	html += '<select data-placeholder="Saved versions" id="found_versions" class="chzen-select" style="width:16em;">';
@@ -45,14 +45,14 @@ function createVersionsDropdown(filename, files) {
 	//html += '<input type="button" value="Revert file" onclick="revertFile()" />';
 	html += '<input type="button" value="All versions..." onclick="window.location=\''+historyUrl+'\'" name="makelink" id="makelink" />';
 	html += '<input id="link" style="display:none; width:90%;" />';
-	
+
 	if (filename) {
 		$('tr').filterAttr('data-file',filename).addClass('mouseOver');
 		$(html).appendTo($('tr').filterAttr('data-file',filename).find('td.filename'));
 	} else {
 		$(html).appendTo($('thead .share'));
 	}
-	
+
 	$.ajax({
 		type: 'GET',
 		url: OC.filePath('files_versions', 'ajax', 'getVersions.php'),
@@ -60,9 +60,9 @@ function createVersionsDropdown(filename, files) {
 		data: { source: files },
 		async: false,
 		success: function( versions ) {
-			
+
 			//alert("helo "+OC.linkTo('files_versions', 'ajax/getVersions.php'));
-			
+
 			if (versions) {
 				$.each( versions, function(index, row ) {
 					addVersion( row );
@@ -79,9 +79,9 @@ function createVersionsDropdown(filename, files) {
 			})
 		}
 	});
-	
+
 	function revertFile(file, revision) {
-		
+
 		$.ajax({
 			type: 'GET',
 			url: OC.linkTo('files_versions', 'ajax/rollbackVersion.php'),
@@ -99,16 +99,16 @@ function createVersionsDropdown(filename, files) {
 					});
 				}
 			}
-		});	
-	
+		});
+
 	}
-	
+
 	function addVersion(revision ) {
 		name=formatDate(revision.version*1000);
 		var version=$('<option/>');
 		version.attr('value',revision.version);
 		version.text(name);
-		
+
 // 		} else {
 // 			var checked = ((permissions > 0) ? 'checked="checked"' : 'style="display:none;"');
 // 			var style = ((permissions == 0) ? 'style="display:none;"' : '');
@@ -119,11 +119,11 @@ function createVersionsDropdown(filename, files) {
 // 			user += '<label for="'+uid_shared_with+'" '+style+'>can edit</label>';
 // 			user += '</li>';
 // 		}
-		
+
 		version.appendTo('#found_versions');
 	}
 
 	$('#dropdown').show('blind');
-	
-	
+
+
 }
diff --git a/apps/files_versions/templates/history.php b/apps/files_versions/templates/history.php
index 1b44255642..d4f875a36e 100644
--- a/apps/files_versions/templates/history.php
+++ b/apps/files_versions/templates/history.php
@@ -11,14 +11,14 @@ if( isset( $_['message'] ) ) {
 }else{
 
 	if( isset( $_['outcome_stat'] ) ) {
-		
+
 		echo( '<div id="feedback-messages" class="'.$_['outcome_stat'].'"><h3>'.$_['outcome_msg'] ).'</h3></div><br>';
 
 	}
 
 	echo( '<strong>Versions of '.$_['path'] ).'</strong><br>';
 	echo('<p><em>Revert a file to a previous version by clicking on its revert button</em></p><br />');
-	
+
 	foreach ( $_['versions'] as $v ) {
 		echo ' ';
 		echo OCP\Util::formatDate( doubleval($v['version']) );
diff --git a/apps/user_webdavauth/user_webdavauth.php b/apps/user_webdavauth/user_webdavauth.php
index 71c503f940..4490b1e451 100755
--- a/apps/user_webdavauth/user_webdavauth.php
+++ b/apps/user_webdavauth/user_webdavauth.php
@@ -23,11 +23,11 @@
 
 class OC_USER_WEBDAVAUTH extends OC_User_Backend {
 	protected $webdavauth_url;
-	
+
 	public function __construct() {
 		$this->webdavauth_url = OC_Config::getValue( "user_webdavauth_url" );
 	}
-	
+
 	public function createUser() {
 		// Can't create user
 		OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to create users from web frontend using WebDAV user backend',3);
@@ -45,14 +45,14 @@ class OC_USER_WEBDAVAUTH extends OC_User_Backend {
 		OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to change password for users from web frontend using WebDAV user backend',3);
 		return false;
 	}
-	
+
 	public function checkPassword( $uid, $password ) {
 
 		$url= 'http://'.urlencode($uid).':'.urlencode($password).'@'.$this->webdavauth_url;
 		$headers = get_headers($url);
 		if($headers==false){
 			OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to connect to WebDAV Url: "'.$this->webdavauth_url.'" ' ,3);
-			return false;	
+			return false;
 
 		}
 		$returncode= substr($headers[0], 9, 3);
@@ -64,7 +64,7 @@ class OC_USER_WEBDAVAUTH extends OC_User_Backend {
 		}
 
 	}
-	
+
 	/*
 	* we don´t know if a user exists without the password. so we have to return false all the time
 	*/
@@ -77,7 +77,7 @@ class OC_USER_WEBDAVAUTH extends OC_User_Backend {
 	*/
 	public function getUsers(){
 		$returnArray = array();
-		
+
 		return $returnArray;
 	}
 }