Handle Macintosh style line endings for CSV import

include/class.user.php

@@ -456,6 +456,8 @@ class User extends UserModel {
 
     function importFromPost($stuff, $extra=array()) {
         if (is_array($stuff) && !$stuff['error']) {
+            // Properly detect Macintosh style line endings
+            ini_set('auto_detect_line_endings', true);
             $stream = fopen($stuff['tmp_name'], 'r');
         }
         elseif ($stuff) {

setup/cli/modules/user.php

@@ -31,6 +31,9 @@ class UserManager extends Module {
 
         switch ($args['action']) {
             case 'import':
+                // Properly detect Macintosh style line endings
+                ini_set('auto_detect_line_endings', true);
+
                 if (!$options['file'])
                     $this->fail('CSV file to import users from is required!');
                 elseif (!($this->stream = fopen($options['file'], 'rb')))