mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed review issues

This commit is contained in:
Bart Visscher 2013-07-22 23:04:14 +02:00
parent 25e3c9cbeb
commit 179b42c56d
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/app.php
View File

@ -840,7 +840,8 @@ class OC_App{
} }
catch (Exception $e) { catch (Exception $e) {
OC_Hook::emit('update', 'failure', 'Failed to update '.$info['name'].' app: '.$e->getMessage()); OC_Hook::emit('update', 'failure', 'Failed to update '.$info['name'].' app: '.$e->getMessage());
throw new RuntimeException('Failed to upgrade "'.$app.'". Exception="'.$e->getMessage().'"'); $l = OC_L10N::get('lib');
throw new RuntimeException($l->t('Failed to upgrade "%s".', array($app)), 0, $e);
} }
OC_Appconfig::setValue($app, 'installed_version', OC_App::getAppVersion($app)); OC_Appconfig::setValue($app, 'installed_version', OC_App::getAppVersion($app));
} }

10
lib/files.php
View File

@ -62,7 +62,8 @@ class OC_Files {
$zip = new ZipArchive(); $zip = new ZipArchive();
$filename = OC_Helper::tmpFile('.zip'); $filename = OC_Helper::tmpFile('.zip');
if ($zip->open($filename, ZIPARCHIVE::CREATE | ZIPARCHIVE::OVERWRITE)!==true) { if ($zip->open($filename, ZIPARCHIVE::CREATE | ZIPARCHIVE::OVERWRITE)!==true) {
throw new Exception("cannot open '$filename'\n"); $l = OC_L10N::get('lib');
throw new Exception($l->t('cannot open "%s"', array($filename)));
} }
foreach ($files as $file) { foreach ($files as $file) {
$file = $dir . '/' . $file; $file = $dir . '/' . $file;
@ -93,7 +94,8 @@ class OC_Files {
$zip = new ZipArchive(); $zip = new ZipArchive();
$filename = OC_Helper::tmpFile('.zip'); $filename = OC_Helper::tmpFile('.zip');
if ($zip->open($filename, ZIPARCHIVE::CREATE | ZIPARCHIVE::OVERWRITE)!==true) { if ($zip->open($filename, ZIPARCHIVE::CREATE | ZIPARCHIVE::OVERWRITE)!==true) {
throw new Exception("cannot open '$filename'\n"); $l = OC_L10N::get('lib');
throw new Exception($l->t('cannot open "%s"', array($filename)));
} }
$file = $dir . '/' . $files; $file = $dir . '/' . $files;
self::zipAddDir($file, $zip); self::zipAddDir($file, $zip);
@ -249,8 +251,8 @@ class OC_Files {
header("HTTP/1.0 409 Conflict"); header("HTTP/1.0 409 Conflict");
OC_Template::printErrorPage( OC_Template::printErrorPage(
$l->t('Selected files too large to generate zip file.'), $l->t('Selected files too large to generate zip file.'),
'Download the files in smaller chunks, seperately' $l->t('Download the files in smaller chunks, seperately or kindly ask your administrator.')
.' or kindly ask your administrator.<br/><a href="javascript:history.back()">' .'<br/><a href="javascript:history.back()">'
. $l->t('Back to Files') . '</a>' . $l->t('Back to Files') . '</a>'
); );
exit; exit;

5
lib/template.php
View File

@ -536,8 +536,9 @@ class OC_Template{
if (!empty($hint)) { if (!empty($hint)) {
$hint = '<pre>'.$hint.'</pre>'; $hint = '<pre>'.$hint.'</pre>';
} }
while (method_exists($exception,'previous') && $exception = $exception->previous()) { $l = OC_L10N::get('lib');
$error_msg .= '<br/>Caused by: '; while (method_exists($exception, 'previous') && $exception = $exception->previous()) {
$error_msg .= '<br/>'.$l->t('Caused by:').' ';
if ($exception->getCode()) { if ($exception->getCode()) {
$error_msg .= '['.$exception->getCode().'] '; $error_msg .= '['.$exception->getCode().'] ';
} }