[mango] Handle DOS line endings

[Olav Vitters <ovitters src gnome org>]

commit aab52cdc4830c82a95858e3e80fe3fa839563c36
Author: Olav Vitters <olav vitters nl>
Date:   Fri Sep 10 14:15:00 2010 +0200

    Handle DOS line endings

 www/new_account.php |    2 +-
 www/new_user.php    |    2 +-
 www/update_user.php |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/www/new_account.php b/www/new_account.php
index 09be88d..d102e78 100755
--- a/www/new_account.php
+++ b/www/new_account.php
@@ -121,7 +121,7 @@ class NewAccount {
         if(is_uploaded_file($_FILES['keyfile']['tmp_name'])) {
             $keyfile = file_get_contents($_FILES['keyfile']['tmp_name']);
         }
-        $newkeylist = $keyfile."\n".$_POST['newkeys'];
+        $newkeylist = str_replace("\r", "", $keyfile."\n".$_POST['newkeys']);
         $newkeys = split("\n", $newkeylist);
         foreach($newkeys as $key) {
             if(empty($key) || substr($key, 0, 3) != "ssh") continue;
diff --git a/www/new_user.php b/www/new_user.php
index 38745ed..29e7ad4 100755
--- a/www/new_user.php
+++ b/www/new_user.php
@@ -163,7 +163,7 @@ class NewUser {
         if($_FILES['keyfile']['tmp_name']) {
             $keyfile = file_get_contents($_FILES['keyfile']['tmp_name']);
         }
-        $newkeylist = $keyfile . "\n" . $_POST['newkeys'];
+        $newkeylist = str_replace("\r", "", $keyfile . "\n" . $_POST['newkeys']);
         $newkeys = split("\n", $newkeylist);
         foreach($newkeys as $key) {
             if(empty($key) || substr($key, 0, 3) != "ssh") continue;
diff --git a/www/update_user.php b/www/update_user.php
index 49f5659..3f1b1f3 100755
--- a/www/update_user.php
+++ b/www/update_user.php
@@ -204,7 +204,7 @@ class UpdateUser {
             $newkeys .= file_get_contents($_FILES['keyfile']['tmp_name']);
         }
         $newkeys .= "\n".$_POST['newkeys'];
-        $newkeys = split("\n", $newkeys);
+        $newkeys = split("\n", str_replace("\r", "", $newkeys));
         foreach($newkeys as $key) {
             if(empty($key) || substr($key, 0, 3) != "ssh") continue;
             $this->user->authorizedKeys[] = $key;