From bc1f0fd306ac59501e92f9308a91c1fe7d61cd2b Mon Sep 17 00:00:00 2001 From: Matthias Mees Date: Tue, 3 Feb 2015 18:46:47 +0100 Subject: [PATCH] Rework messages emitted by upload/delete in media db Due to a regression in how these messages are emitted, these now need to emit their msg markup in include/admin/images.inc.php or include/functions_images.inc.php to avoid nested msg containers. References #287 --- include/admin/images.inc.php | 32 ++++++++++++++--------------- include/functions_images.inc.php | 2 +- templates/2k11/admin/images.inc.tpl | 2 +- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/include/admin/images.inc.php b/include/admin/images.inc.php index 6ebcf72c..4aa578a7 100644 --- a/include/admin/images.inc.php +++ b/include/admin/images.inc.php @@ -60,7 +60,7 @@ switch ($serendipity['GET']['adminAction']) { $messages = array(); $data['case_do_delete'] = true; $messages[] = serendipity_deleteImage($serendipity['GET']['fid']); - $messages[] = sprintf(RIP_ENTRY, $serendipity['GET']['fid']); + $messages[] = sprintf(' ' . RIP_ENTRY . '', $serendipity['GET']['fid']); $data['showML'] = showMediaLibrary(); $data['messages'] = $messages; @@ -81,7 +81,7 @@ switch ($serendipity['GET']['adminAction']) { if ($id > 0) { $image = serendipity_fetchImageFromDatabase($id); $messages[] = serendipity_deleteImage((int)$id); - $messages[] = sprintf(RIP_ENTRY, $image['id'] . ' - ' . serendipity_specialchars($image['realname'])); + $messages[] = sprintf(' ' . RIP_ENTRY . '', $image['id'] . ' - ' . serendipity_specialchars($image['realname'])); } } $data['showML'] = showMediaLibrary(); @@ -166,7 +166,7 @@ switch ($serendipity['GET']['adminAction']) { break; } - $messages[] = '' . ADDING_IMAGE . ''; + $messages[] = ' ' . ADDING_IMAGE . ''; $authorid = (isset($serendipity['POST']['all_authors']) && $serendipity['POST']['all_authors'] == 'true') ? '0' : $serendipity['authorid']; @@ -192,7 +192,7 @@ switch ($serendipity['GET']['adminAction']) { $tfile = serendipity_uploadSecure(basename($tfile)); if (serendipity_isActiveFile($tfile)) { - $messages[] = sprintf(ERROR_FILE_FORBIDDEN, $tfile); + $messages[] = sprintf(' ' . ERROR_FILE_FORBIDDEN . '', $tfile); break; } @@ -200,13 +200,13 @@ switch ($serendipity['GET']['adminAction']) { $target = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $serendipity['POST']['target_directory'][$tindex] . $tfile; if (!serendipity_checkDirUpload($serendipity['POST']['target_directory'][$tindex])) { - $messages[] = PERM_DENIED; + $messages[] = ' ' . PERM_DENIED . ''; return; } $realname = $tfile; if (file_exists($target)) { - $messages[] = '(' . $target . ') ' . ERROR_FILE_EXISTS_ALREADY . ''; + $messages[] = ' ' . $target . ' - ' . ERROR_FILE_EXISTS_ALREADY . ''; $realname = serendipity_imageAppend($tfile, $target, $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $serendipity['POST']['target_directory'][$tindex]); } @@ -218,7 +218,7 @@ switch ($serendipity['GET']['adminAction']) { // Try to get the URL if (PEAR::isError($req->sendRequest()) || $req->getResponseCode() != '200') { - $messages[] = sprintf(REMOTE_FILE_NOT_FOUND, $serendipity['POST']['imageurl']); + $messages[] = sprintf(' ' . REMOTE_FILE_NOT_FOUND . '', $serendipity['POST']['imageurl']); } else { // Fetch file $fContent = $req->getResponseBody(); @@ -230,14 +230,14 @@ switch ($serendipity['GET']['adminAction']) { fclose($fp); $image_id = @serendipity_insertHotlinkedImageInDatabase($tfile, $serendipity['POST']['imageurl'], $authorid, null, $tempfile); - $messages[] = sprintf( HOTLINK_DONE , $serendipity['POST']['imageurl'] , $tfile .''); + $messages[] = sprintf(' ' . HOTLINK_DONE . '', $serendipity['POST']['imageurl'] , $tfile .''); serendipity_plugin_api::hook_event('backend_image_addHotlink', $tempfile); } else { $fp = fopen($target, 'w'); fwrite($fp, $fContent); fclose($fp); - $messages[] = sprintf(FILE_FETCHED , $serendipity['POST']['imageurl'] , $tfile); + $messages[] = sprintf(' ' . FILE_FETCHED . '', $serendipity['POST']['imageurl'] , $tfile . ''); if (serendipity_checkMediaSize($target)) { $thumbs = array(array( @@ -249,7 +249,7 @@ switch ($serendipity['GET']['adminAction']) { foreach($thumbs as $thumb) { // Create thumbnail if ( $created_thumbnail = serendipity_makeThumbnail($tfile, $serendipity['POST']['target_directory'][$tindex], $thumb['thumbSize'], $thumb['thumb']) ) { - $messages[] = THUMB_CREATED_DONE . ''; + $messages[] = ' ' . THUMB_CREATED_DONE . ''; } } @@ -294,14 +294,14 @@ switch ($serendipity['GET']['adminAction']) { $tfile = serendipity_uploadSecure(basename($tfile)); if (serendipity_isActiveFile($tfile)) { - $messages[] = ERROR_FILE_FORBIDDEN .' '. $tfile; + $messages[] = ' ' . ERROR_FILE_FORBIDDEN .' '. $tfile . ''; continue; } $serendipity['POST']['target_directory'][$idx] = serendipity_uploadSecure($serendipity['POST']['target_directory'][$idx], true, true); if (!serendipity_checkDirUpload($serendipity['POST']['target_directory'][$idx])) { - $messages[] = PERM_DENIED; + $messages[] = ' ' . PERM_DENIED . ''; continue; } @@ -309,13 +309,13 @@ switch ($serendipity['GET']['adminAction']) { $realname = $tfile; if (file_exists($target)) { - $messages[] = '(' . $target . ') ' . ERROR_FILE_EXISTS_ALREADY; + $messages[] = ' ' . $target . ' - ' . ERROR_FILE_EXISTS_ALREADY . ''; $realname = serendipity_imageAppend($tfile, $target, $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $serendipity['POST']['target_directory'][$idx]); } // Accept file if (is_uploaded_file($uploadtmp) && serendipity_checkMediaSize($uploadtmp) && move_uploaded_file($uploadtmp, $target)) { - $messages[] = sprintf( FILE_UPLOADED , $uploadfile , $target); + $messages[] = sprintf(' ' . FILE_UPLOADED . '', $uploadfile , $target); @umask(0000); @chmod($target, 0664); @@ -328,7 +328,7 @@ switch ($serendipity['GET']['adminAction']) { foreach($thumbs as $thumb) { // Create thumbnail if ( $created_thumbnail = serendipity_makeThumbnail($tfile, $serendipity['POST']['target_directory'][$idx], $thumb['thumbSize'], $thumb['thumb']) ) { - $messages[] = THUMB_CREATED_DONE; + $messages[] = ' ' . THUMB_CREATED_DONE . ''; } } @@ -343,7 +343,7 @@ switch ($serendipity['GET']['adminAction']) { } else { // necessary for the ajax-uplaoder to show upload errors header("Internal Server Error", true, 500); - $messages[] = ERROR_UNKNOWN_NOUPLOAD; + $messages[] = ' ' . ERROR_UNKNOWN_NOUPLOAD . ''; } } } diff --git a/include/functions_images.inc.php b/include/functions_images.inc.php index 9eb7b989..354bb22b 100644 --- a/include/functions_images.inc.php +++ b/include/functions_images.inc.php @@ -362,7 +362,7 @@ function serendipity_deleteImage($id) { $messages .= sprintf(' ' . FILE_NOT_FOUND . '', $dFile); } } else { - $messages .= sprintf(DELETE_HOTLINK_FILE, $file['name']); + $messages .= sprintf(' ' . DELETE_HOTLINK_FILE . '', $file['name']); } serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}images WHERE id = ". (int)$id); diff --git a/templates/2k11/admin/images.inc.tpl b/templates/2k11/admin/images.inc.tpl index 50e102b0..00bcc503 100644 --- a/templates/2k11/admin/images.inc.tpl +++ b/templates/2k11/admin/images.inc.tpl @@ -1,5 +1,5 @@ {foreach $messages as $message} - {$message} + {$message} {/foreach} {if $case_doSync}