diff options
author | Frank Karlitschek <karlitschek@kde.org> | 2011-08-06 23:31:38 +0200 |
---|---|---|
committer | Frank Karlitschek <karlitschek@kde.org> | 2011-08-06 23:31:38 +0200 |
commit | 1dc3cb67fa2420703c1e07125d01dddc4dce0356 (patch) | |
tree | 46599893d78115aa0394c8f15842722fc3c772c5 /lib | |
parent | a689fa18dfb66226527499ea707b2ff517561851 (diff) | |
download | nextcloud-server-1dc3cb67fa2420703c1e07125d01dddc4dce0356.tar.gz nextcloud-server-1dc3cb67fa2420703c1e07125d01dddc4dce0356.zip |
more improved error reporting
Diffstat (limited to 'lib')
-rw-r--r-- | lib/base.php | 19 | ||||
-rwxr-xr-x | lib/helper.php | 2 |
2 files changed, 12 insertions, 9 deletions
diff --git a/lib/base.php b/lib/base.php index d02f63a2766..270e8c20c75 100644 --- a/lib/base.php +++ b/lib/base.php @@ -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...'; diff --git a/lib/helper.php b/lib/helper.php index 5dc3dd44a15..fa5163ac266 100755 --- a/lib/helper.php +++ b/lib/helper.php @@ -204,7 +204,7 @@ class OC_Helper { } } closedir($dh); - if(chmod($path, $filemode)) + if(@chmod($path, $filemode)) return TRUE; else return FALSE; |