From 8c5df31c4951423857e394de02ae25ea5cb53698 Mon Sep 17 00:00:00 2001 From: Bart Visscher Date: Sun, 21 Jul 2013 22:30:32 +0200 Subject: [PATCH] DRY use OC_Template::printErrorPage --- lib/files.php | 28 +++++++++------------------- lib/setup.php | 4 +--- 2 files changed, 10 insertions(+), 22 deletions(-) diff --git a/lib/files.php b/lib/files.php index ce46d13da4..0e5b5d54ff 100644 --- a/lib/files.php +++ b/lib/files.php @@ -220,16 +220,11 @@ class OC_Files { if (!OC_Config::getValue('allowZipDownload', true)) { $l = OC_L10N::get('lib'); header("HTTP/1.0 409 Conflict"); - $tmpl = new OC_Template('', 'error', 'user'); - $errors = array( - array( - 'error' => $l->t('ZIP download is turned off.'), - 'hint' => $l->t('Files need to be downloaded one by one.') - . '
' . $l->t('Back to Files') . '', - ) + OC_Template::printErrorPage( + $l->t('ZIP download is turned off.'), + $l->t('Files need to be downloaded one by one.') + . '
' . $l->t('Back to Files') . '' ); - $tmpl->assign('errors', $errors); - $tmpl->printPage(); exit; } @@ -252,17 +247,12 @@ class OC_Files { if ($totalsize > $zipLimit) { $l = OC_L10N::get('lib'); header("HTTP/1.0 409 Conflict"); - $tmpl = new OC_Template('', 'error', 'user'); - $errors = array( - array( - 'error' => $l->t('Selected files too large to generate zip file.'), - 'hint' => 'Download the files in smaller chunks, seperately' - .' or kindly ask your administrator.
' - . $l->t('Back to Files') . '', - ) + OC_Template::printErrorPage( + $l->t('Selected files too large to generate zip file.'), + 'Download the files in smaller chunks, seperately' + .' or kindly ask your administrator.
' + . $l->t('Back to Files') . '' ); - $tmpl->assign('errors', $errors); - $tmpl->printPage(); exit; } } diff --git a/lib/setup.php b/lib/setup.php index 59f4cab75d..05a4989097 100644 --- a/lib/setup.php +++ b/lib/setup.php @@ -185,9 +185,7 @@ class OC_Setup { $hint = $l->t('Please double check the installation guides.', 'http://doc.owncloud.org/server/5.0/admin_manual/installation.html'); - $tmpl = new OC_Template('', 'error', 'guest'); - $tmpl->assign('errors', array(1 => array('error' => $error, 'hint' => $hint))); - $tmpl->printPage(); + OC_Template::printErrorPage($error, $hint); exit(); } }