more improved error reporting
This commit is contained in:
parent
a689fa18df
commit
1dc3cb67fa
|
@ -4,13 +4,13 @@
|
||||||
<title>ownCloud</title>
|
<title>ownCloud</title>
|
||||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
<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'); ?>" />
|
<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" />
|
<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
|
||||||
<?php endforeach; ?>
|
<?php endforeach; ?>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
var oc_webroot = '<?php global $WEBROOT; echo $WEBROOT; ?>';
|
var oc_webroot = '<?php global $WEBROOT; echo $WEBROOT; ?>';
|
||||||
// </script>
|
// </script>
|
||||||
<?php foreach($_['jsfiles'] as $jsfile): ?>
|
<?php if(isset($_['jsfiles'])) foreach($_['jsfiles'] as $jsfile): ?>
|
||||||
<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
|
<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
|
||||||
<?php endforeach; ?>
|
<?php endforeach; ?>
|
||||||
|
|
||||||
|
|
19
lib/base.php
19
lib/base.php
|
@ -128,14 +128,6 @@ if( OC_Config::getValue( "forcessl", false )){
|
||||||
$errors=OC_Util::checkServer();
|
$errors=OC_Util::checkServer();
|
||||||
$error=(count($errors)>0);
|
$error=(count($errors)>0);
|
||||||
|
|
||||||
if($error) {
|
|
||||||
$tmpl = new OC_Template( '', 'error', 'guest' );
|
|
||||||
$tmpl->assign('errors',$errors);
|
|
||||||
$tmpl->printPage();
|
|
||||||
exit;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// User and Groups
|
// User and Groups
|
||||||
if( !OC_Config::getValue( "installed", false )){
|
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');
|
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
|
// FROM Connect.php
|
||||||
function OC_CONNECT_TEST($path,$user,$password){
|
function OC_CONNECT_TEST($path,$user,$password){
|
||||||
echo 'connecting...';
|
echo 'connecting...';
|
||||||
|
|
|
@ -204,7 +204,7 @@ class OC_Helper {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
closedir($dh);
|
closedir($dh);
|
||||||
if(chmod($path, $filemode))
|
if(@chmod($path, $filemode))
|
||||||
return TRUE;
|
return TRUE;
|
||||||
else
|
else
|
||||||
return FALSE;
|
return FALSE;
|
||||||
|
|
Loading…
Reference in New Issue