[php-blog-cvs] serendipity NEWS,1.103.4.1,1.103.4.2 serendipity_admin_images.inc.php,1.20,1.20.4.1 serendipity_config.inc.php,1.63.2.2,1.63.2.3

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12836

Modified Files:
      Tag: branch_0_6
	NEWS serendipity_admin_images.inc.php 
	serendipity_config.inc.php 
Log Message:
mfh


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.103.4.1
retrieving revision 1.103.4.2
diff -u -d -r1.103.4.1 -r1.103.4.2
--- NEWS	17 Apr 2004 11:27:11 -0000	1.103.4.1
+++ NEWS	26 Apr 2004 10:56:42 -0000	1.103.4.2
@@ -1,5 +1,30 @@
 # $Id$
 
+Fixes since -rc1:
+------------------------------------------------------------------------
+
+    * Image upload now strips all characters not suggested for filename
+      use (garvinhicking)
+    * Language Charset Header are now used throughout s9y which make it
+      completely foreign-language compatible
+    * German translation fix
+    * Upgrader kills the current session for possible changes inside
+      session data on upgrade
+    * Fixed wrong comparison operator - bug reported by tom, where nl2br
+      plugin has "reversed" logic.
+    * Fixed textile plugin not enabled by default after adding it as a
+      plugin
+    * Comments plugin now correctly wordwraps
+    * Fixed wrong HTML links for WYSIWYG-editor in Internet Explorer
+    * Fixed htmlentites acceptance for foreign language entry titles
+    * Relaxed dependency on WIKI plugin, if the inclusion fails.
+    * PostgreSQL SQL update files
+    * Better detection of serendipityPath variable
+    * Adjustable WYSIWYG-language for foreign languages
+    * Fixed special characters for WYSIWYG-htmlarea.css file
+    * Fixed WYSIWYG-editing error for HTML Nugget plugin
+    * newline fixes inside the files (cosmetic issues)
+
 Version 0.6 ()
 ------------------------------------------------------------------------
 
@@ -53,9 +78,9 @@
     * Relaxed umask/chmod file and directory creation
       (garvinhicking)
 
-    * Abstract archives/URL locations and regex-patterns in a central 
+    * Abstract archives/URL locations and regex-patterns in a central
       place for easier maintenance (zem)
- 
+
     * Optimized db indizes on 'entries' (zem)
 
     * Added shoutbox plugin (Matthias Lange, garvinhicking)

Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.63.2.2
retrieving revision 1.63.2.3
diff -u -d -r1.63.2.2 -r1.63.2.3
--- serendipity_config.inc.php	13 Apr 2004 10:32:03 -0000	1.63.2.2
+++ serendipity_config.inc.php	26 Apr 2004 10:56:42 -0000	1.63.2.3
@@ -15,7 +15,7 @@
 include_once(S9Y_INCLUDE_PATH . 'compat.php');
 ini_set('session.use_trans_sid', 0);
 
-$serendipity['version']      = '0.6-rc1';
+$serendipity['version']      = '0.6-rc2';
 $serendipity['production']   = 1;
 $serendipity['rewrite']      = 'none';
 $serendipity['messagestack'] = array();

Index: serendipity_admin_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_images.inc.php,v
retrieving revision 1.20
retrieving revision 1.20.4.1
diff -u -d -r1.20 -r1.20.4.1
--- serendipity_admin_images.inc.php	3 Apr 2004 17:36:16 -0000	1.20
+++ serendipity_admin_images.inc.php	26 Apr 2004 10:56:42 -0000	1.20.4.1
@@ -58,7 +58,7 @@
     case 'rename':
         $file = serendipity_fetchImageFromDatabase($serendipity['GET']['fid']);
         $newfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $serendipity['GET']['newname'] . '.' . $file['extension'];
-        $oldfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file['name'] . '.'. $file['extension']; 
+        $oldfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file['name'] . '.'. $file['extension'];
         if ($serendipity['GET']['newname'] != '' && file_exists($oldfile) && !file_exists($newfile)) {
             // Rename file
             rename($oldfile, $newfile);
@@ -102,7 +102,8 @@
         } else {
             $tfile   = basename($serendipity['POST']['imageurl']);
         }
-        
+
+        $tfile  = preg_replace('@[^0-9a-z\._/-]@i', '', $tfile);
         $target = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $tfile;
 
         if (file_exists($target)) {
@@ -129,7 +130,8 @@
         } else {
             $tfile   = $_FILES['userfile']['name'];
         }
-        
+
+        $tfile  = preg_replace('@[^0-9a-z\._/-]@i', '', $tfile);
         $target = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $tfile;
 
         if (file_exists($target)) {
@@ -161,7 +163,7 @@
         document.getElementById(field).value = value.replace(re, "$1");
     }
     </script>
-    
+
     <form action="?" method="POST" id="uploadform" enctype="multipart/form-data">
         <div>
             <input type="hidden" name="MAX_FILE_SIZE"            value="3000000" />