From: Ben Schmidt <none@none>
Date: Fri, 30 Jul 2010 14:28:40 +0000 (+1000)
Subject: Ensure files written by php-admin have Unix EOL and sane permissions
X-Git-Tag: RELEASE_1_2_18a1~124
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9009e32400fe66366477eb5e940563ff41cd6cd7;p=thirdparty%2Fmlmmj.git

Ensure files written by php-admin have Unix EOL and sane permissions
---

diff --git a/contrib/web/php-admin/htdocs/save.php b/contrib/web/php-admin/htdocs/save.php
index 908b8144..27b01da6 100644
--- a/contrib/web/php-admin/htdocs/save.php
+++ b/contrib/web/php-admin/htdocs/save.php
@@ -39,6 +39,8 @@ function mlmmj_boolean($name, $nicename, $text)
     {
 	if(!touch($file))
 	    die("Couldn't open ".$file." for writing");
+	if (!chmod($file, 0644))
+	    die("Couldn't chmod ".$file);
     }
     else
 	@unlink($file);
@@ -60,8 +62,11 @@ function mlmmj_list($name, $nicename, $text)
 	if (!$fp = fopen($file, "w"))
 	    die("Couldn't open ".$file." for writing");
 
-	fwrite($fp, $HTTP_POST_VARS[$name]);
+	fwrite($fp, preg_replace('/\\r\\n/',"\n",$HTTP_POST_VARS[$name]));
 	fclose($fp);
+
+	if (!chmod($file, 0644))
+	    die("Couldn't chmod ".$file);
     }
     else
 	@unlink($file);