--- serendipity-nightly/include/admin/images.inc.php	2008-04-09 03:57:10.000000000 +0200
+++ /var/www/include/admin/images.inc.php	2009-05-25 21:08:39.000000000 +0200
@@ -115,6 +115,7 @@
 
         $file   = $serendipity['GET']['fname'];
         serendipity_deleteImage($serendipity['GET']['fid']);
+        showMediaLibrary();
         break;
 
     case 'delete':
@@ -179,7 +180,7 @@
         if (!serendipity_checkFormToken() || !serendipity_checkPermission('adminImagesAdd')) {
             return;
         }
-
+        $messages = array();
         if ($serendipity['POST']['adminSubAction'] == 'properties') {
             $properties        = serendipity_parsePropertyForm();
             $image_id          = $properties['image_id'];
@@ -196,8 +197,6 @@
         }
 
 ?>
-    <div class="image_add"><b><?php echo ADDING_IMAGE; ?></b></div>
-    <br /><br />
 <?php
 
     $authorid = (isset($serendipity['POST']['all_authors']) && $serendipity['POST']['all_authors'] == 'true') ? '0' : $serendipity['authorid'];
@@ -221,7 +220,7 @@
         $tfile = serendipity_uploadSecure(basename($tfile));
 
         if (serendipity_isActiveFile($tfile)) {
-            printf(ERROR_FILE_FORBIDDEN, $tfile);
+            $messages[] = sprintf(ERROR_FILE_FORBIDDEN, $tfile);
             break;
         }
 
@@ -229,13 +228,13 @@
         $target = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $serendipity['POST']['target_directory'][$tindex] . $tfile;
 
         if (!serendipity_checkDirUpload($serendipity['POST']['target_directory'][$tindex])) {
-            echo PERM_DENIED;
+            $messages[] = PERM_DENIED;
             return;
         }
 
         $realname = $tfile;
         if (file_exists($target)) {
-            echo '(' . $target . ') ' . ERROR_FILE_EXISTS_ALREADY . '<br />';
+            $messages[] = '(' . $target . ') ' . ERROR_FILE_EXISTS_ALREADY . '';
             $realname = serendipity_imageAppend($tfile, $target, $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $serendipity['POST']['target_directory'][$tindex]);
         }
 
@@ -247,7 +246,7 @@
         // Try to get the URL
 
         if (PEAR::isError($req->sendRequest()) || $req->getResponseCode() != '200') {
-            printf(REMOTE_FILE_NOT_FOUND, $serendipity['POST']['imageurl']);
+            $messages[] = sprintf(REMOTE_FILE_NOT_FOUND, $serendipity['POST']['imageurl']);
         } else {
             // Fetch file
             $fContent = $req->getResponseBody();
@@ -259,14 +258,14 @@
                 fclose($fp);
 
                 $image_id = @serendipity_insertHotlinkedImageInDatabase($tfile, $serendipity['POST']['imageurl'], $authorid, null, $tempfile);
-                printf(HOTLINK_DONE. '<br />', $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);
 
-                printf(FILE_FETCHED . '<br />', $serendipity['POST']['imageurl'], $tfile);
+                $messages[] = sprintf(FILE_FETCHED , $serendipity['POST']['imageurl'] , $tfile);
 
                 if (serendipity_checkMediaSize($target)) {
                     $thumbs = array(array(
@@ -278,7 +277,7 @@
                     foreach($thumbs as $thumb) {
                         // Create thumbnail
                         if ( $created_thumbnail = serendipity_makeThumbnail($tfile, $serendipity['POST']['target_directory'][$tindex], $thumb['thumbSize'], $thumb['thumb']) ) {
-                            echo THUMB_CREATED_DONE . '<br />';
+                            $messages[] = THUMB_CREATED_DONE . '';
                         }
                     }
 
@@ -314,15 +313,14 @@
             $tfile = serendipity_uploadSecure(basename($tfile));
 
 	        if (serendipity_isActiveFile($tfile)) {
-                printf(ERROR_FILE_FORBIDDEN, $tfile);
-                echo '<br />';
+                $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])) {
-                echo PERM_DENIED;
+                $messages[] = PERM_DENIED;
                 continue;
             }
 
@@ -330,13 +328,13 @@
 
             $realname = $tfile;
             if (file_exists($target)) {
-                echo '(' . $target . ') ' . ERROR_FILE_EXISTS_ALREADY . '<br />';
+                $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)) {
-                printf(FILE_UPLOADED . '<br />', $uploadfile, $target);
+                $messages[] = sprintf( FILE_UPLOADED , $uploadfile , $target);
                 @umask(0000);
                 @chmod($target, 0664);
 
@@ -349,7 +347,7 @@
                 foreach($thumbs as $thumb) {
                     // Create thumbnail
                     if ( $created_thumbnail = serendipity_makeThumbnail($tfile, $serendipity['POST']['target_directory'][$idx], $thumb['thumbSize'], $thumb['thumb']) ) {
-                        echo THUMB_CREATED_DONE . '<br />';
+                        $messages[] = THUMB_CREATED_DONE;
                     }
                 }
 
@@ -362,7 +360,7 @@
                     'created_thumbnail' => $created_thumbnail
                 );
             } else {
-                echo ERROR_UNKNOWN_NOUPLOAD . '<br />';
+                $messages[] = ERROR_UNKNOWN_NOUPLOAD;
             }
         }
     }
@@ -379,6 +377,8 @@
             serendipity_insertMediaProperty('base_hidden', '', $nm['image_id'], $hidden);
         }
     }
+    showMediaLibrary($messages);
+
     break;
 
 
@@ -816,10 +816,24 @@
         break;
 
     default:
-        if (!serendipity_checkPermission('adminImagesView')) {
+        showMediaLibrary();
+
+        break;
+}
+
+function showMediaLibrary($messages=false) {
+    if (!serendipity_checkPermission('adminImagesView')) {
             return;
         }
 
+    if(!empty($messages)) {
+        echo '<div class="imageMessage"><ul>';
+        foreach($messages as $message) {
+            echo '<li>'. $message .'</li>';
+        }
+        echo '</ul></div>';
+    }
+
 ?>
 <script type="text/javascript" language="javascript">
     <!--
@@ -840,7 +854,5 @@
           $serendipity['thumbPerPage'],
           true
         );
-
-        break;
 }
 /* vim: set sts=4 ts=4 expandtab : */