Cleanup error generation in base.php

diff --git a/lib/base.php b/lib/base.php
index 43145e1733ceaf6394423a612dacb8c0de7ff643..1ff462819db4b5a1901cff0aeb213be6748f8bda 100644 (file)
--- a/lib/base.php
+++ b/lib/base.php
@@ -124,10 +124,9 @@ class OC {
                        OC::$THIRDPARTYWEBROOT = rtrim(dirname(OC::$WEBROOT), '/');
                        OC::$THIRDPARTYROOT = rtrim(dirname(OC::$SERVERROOT), '/');
                } else {
-                       echo('3rdparty directory not found! Please put the ownCloud 3rdparty'
+                       throw new Exception('3rdparty directory not found! Please put the ownCloud 3rdparty'
                                .' folder in the ownCloud folder or the folder above.'
                                .' You can also configure the location in the config.php file.');
-                       exit;
                }
                // search the apps folder
                $config_paths = OC_Config::getValue('apps_paths', array());
@@ -150,9 +149,8 @@ class OC {
                }
 
                if (empty(OC::$APPSROOTS)) {
-                       echo('apps directory not found! Please put the ownCloud apps folder in the ownCloud folder'
+                       throw new Exception('apps directory not found! Please put the ownCloud apps folder in the ownCloud folder'
                                .' or the folder above. You can also configure the location in the config.php file.');
-                       exit;
                }
                $paths = array();
                foreach (OC::$APPSROOTS as $path) {
@@ -174,14 +172,11 @@ class OC {
                if (file_exists(OC::$SERVERROOT . "/config/config.php")
                        and !is_writable(OC::$SERVERROOT . "/config/config.php")) {
                        $defaults = new OC_Defaults();
-                       $tmpl = new OC_Template('', 'error', 'guest');
-                       $tmpl->assign('errors', array(1 => array(
-                               'error' => "Can't write into config directory 'config'",
-                               'hint' => 'This can usually be fixed by '
+                       OC_Template::printErrorPage(
+                               "Can't write into config directory 'config'",
+                               'This can usually be fixed by '
                                        .'<a href="' . $defaults->getDocBaseUrl() . '/server/5.0/admin_manual/installation/installation_source.html#set-the-directory-permissions" target="_blank">giving the webserver write access to the config directory</a>.'
-                       )));
-                       $tmpl->printPage();
-                       exit();
+                       );
                }
        }
 
@@ -223,10 +218,7 @@ class OC {
                        header('Retry-After: 120');
 
                        // render error page
-                       $tmpl = new OC_Template('', 'error', 'guest');
-                       $tmpl->assign('errors', array(1 => array('error' => 'ownCloud is in maintenance mode')));
-                       $tmpl->printPage();
-                       exit();
+                       OC_Template::printErrorPage('ownCloud is in maintenance mode');
                }
        }
 
@@ -305,11 +297,7 @@ class OC {
                        $error = 'Session could not be initialized. Please contact your ';
                        $error .= 'system administrator';
 
-                       $tmpl = new OC_Template('', 'error', 'guest');
-                       $tmpl->assign('errors', array(1 => array('error' => $error)));
-                       $tmpl->printPage();
-
-                       exit();
+                       OC_Template::printErrorPage($error);
                }
 
                $sessionLifeTime = self::getSessionLifeTime();