Merge branch 'master' into sharing

Conflicts:
	files/css/files.css

4 files changed, 13 insertions, 5 deletions

diff --git a/lib/base.php b/lib/base.php
index 2e735514347..dc3ed4129cd 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -148,12 +148,15 @@ OC_Group::setBackend( OC_Config::getValue( "groupbackend", "database" ));
 // Add the stuff we need always
 OC_Util::addScript( "jquery-1.6.2.min" );
 OC_Util::addScript( "jquery-ui-1.8.14.custom.min" );
+OC_Util::addScript( "jquery-showpassword" );
+OC_Util::addScript( "jquery-tipsy" );
 OC_Util::addScript( "js" );
 OC_Util::addScript( "multiselect" );
 OC_Util::addScript('search','result');
-OC_Util::addStyle( "jquery-ui-1.8.14.custom" );
 OC_Util::addStyle( "styles" );
 OC_Util::addStyle( "multiselect" );
+OC_Util::addStyle( "jquery-ui-1.8.14.custom" );
+OC_Util::addStyle( "jquery-tipsy" );
 
 // Load Apps
 // This includes plugins for users and filesystems as well
diff --git a/lib/config.php b/lib/config.php
index 16e9ea441d5..dafb37edd33 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -177,8 +177,13 @@ class OC_Config{
 		$content .= ");\n?>\n";
 
 		// Write the file
-		file_put_contents( "$SERVERROOT/config/config.php", $content );
-
+		$result=@file_put_contents( "$SERVERROOT/config/config.php", $content );
+		if(!$result) {
+			$tmpl = new OC_Template( '', 'error', 'guest' );
+			$tmpl->assign('errors',array(1=>array('error'=>"Can't write into config directory 'config'",'hint'=>"You can usually fix this by setting the owner of 'config' to the user that the web server uses (".exec('whoami').")")));
+			$tmpl->printPage();
+			exit;
+		}
 		return true;
 	}
 }
diff --git a/lib/crypt.php b/lib/crypt.php
index 83e6ac4cde0..de1f6c73387 100755
--- a/lib/crypt.php
+++ b/lib/crypt.php
@@ -61,7 +61,7 @@ class OC_Crypt {
 
 			// Write the file
 		        $username=OC_USER::getUser();
-			file_put_contents(OC_Config::getValue( "datadirectory").'/'.$username.'/encryption.key', $enckey );
+			@file_put_contents(OC_Config::getValue( "datadirectory").'/'.$username.'/encryption.key', $enckey );
 		}
 	}
 
diff --git a/lib/files.php b/lib/files.php
index eec1007de1f..bdcae419189 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -121,7 +121,7 @@ class OC_Files {
 			$filename=$dir.'/'.$files;
 		}
 		if($zip or OC_Filesystem::is_readable($filename)){
-			header('Content-Disposition: attachment; filename='.basename($filename));
+			header('Content-Disposition: attachment; filename="'.basename($filename).'"');
 			header('Content-Transfer-Encoding: binary');
 			header('Expires: 0');
 			header('Cache-Control: must-revalidate, post-check=0, pre-check=0');