mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

better error reporting during installation

This commit is contained in:
Frank Karlitschek 2011-08-12 19:22:29 +02:00
parent 14fd20d0ef
commit c2a5b49834
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/config.php
View File

@ -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;
}
}

2
lib/crypt.php
View File

@ -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 );
}
}