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

more improved error reporting

Browse source
This commit is contained in:
Frank Karlitschek 2011-08-06 23:31:38 +02:00
parent a689fa18df
commit 1dc3cb67fa
3 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/templates/layout.guest.php
View file

@ -4,13 +4,13 @@
<title>ownCloud</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
<?php foreach($_['cssfiles'] as $cssfile): ?>
<?php if(isset($_['cssfiles'])) foreach($_['cssfiles'] as $cssfile): ?>
<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
<?php endforeach; ?>
<script type="text/javascript">
var oc_webroot = '<?php global $WEBROOT; echo $WEBROOT; ?>';
// </script>
<?php foreach($_['jsfiles'] as $jsfile): ?>
<?php if(isset($_['jsfiles'])) foreach($_['jsfiles'] as $jsfile): ?>
<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
<?php endforeach; ?>

19
lib/base.php
View file

@ -128,14 +128,6 @@ if( OC_Config::getValue( "forcessl", false )){
$errors=OC_Util::checkServer();
$error=(count($errors)>0);
if($error) {
$tmpl = new OC_Template( '', 'error', 'guest' );
$tmpl->assign('errors',$errors);
$tmpl->printPage();
exit;
}
// User and Groups
if( !OC_Config::getValue( "installed", false )){
@ -173,6 +165,17 @@ OC_HOOK::connect('OC_User', 'post_createUser', 'OC_Connector_Sabre_Principal', '
OC_HOOK::connect('OC_User', 'post_deleteUser', 'OC_Connector_Sabre_Principal', 'deletePrincipal');
if($error) {
$tmpl = new OC_Template( '', 'error', 'guest' );
$tmpl->assign('errors',$errors);
$tmpl->printPage();
exit;
}
// FROM Connect.php
function OC_CONNECT_TEST($path,$user,$password){
echo 'connecting...';

2
lib/helper.php
View file

@ -204,7 +204,7 @@ class OC_Helper {
}
}
closedir($dh);
if(chmod($path, $filemode))
if(@chmod($path, $filemode))
return TRUE;
else
return FALSE;