Changeset 1049 for locker/sql

Timestamp:

Apr 2, 2009, 9:55:40 PM (16 years ago)

Author:

mitchb

Message:

Make get-password deal with carriage returns, because the mysql client
puts up with this nonsense for Windows users.

File:

• locker/sql/bin/get-password (modified) (1 diff)

locker/sql/bin/get-password

@@ -12 +12 @@
         global $env_user;
         $cnfFile = file_get_contents($path);
-        if (preg_match('/\[mysql\][^\[]*host *= *([^\n]*)/',$cnfFile,$match)) {
+        if (preg_match('/\[mysql\][^\[]*host *= *([^\r\n]*)/',$cnfFile,$match)) {
                 $host = $match[1];
-        } elseif (preg_match('/\[client\][^\[]*host *= *([^\n]*)/',$cnfFile,$match)) {
+        } elseif (preg_match('/\[client\][^\[]*host *= *([^\r\n]*)/',$cnfFile,$match)) {
                 $host = $match[1];
         } else {
                 $host = 'sql.mit.edu';
         }
-        if (preg_match('/\[mysql\][^\[]*user *= *([^\n]*)/',$cnfFile,$match)) {
+        if (preg_match('/\[mysql\][^\[]*user *= *([^\r\n]*)/',$cnfFile,$match)) {
                 $user = $match[1];
-        } elseif (preg_match('/\[client\][^\[]*user *= *([^\n]*)/',$cnfFile,$match)) {
+        } elseif (preg_match('/\[client\][^\[]*user *= *([^\r\n]*)/',$cnfFile,$match)) {
                 $user = $match[1];
         } else {
                 $user = $env_user;
         }
-        if (preg_match('/\[mysql\][^\[]*password *= *([^\n]*)/',$cnfFile,$match)) {
+        if (preg_match('/\[mysql\][^\[]*password *= *([^\r\n]*)/',$cnfFile,$match)) {
                 $password = $match[1];
-        } elseif (preg_match('/\[client\][^\[]*password *= *([^\n]*)/',$cnfFile,$match)) {
+        } elseif (preg_match('/\[client\][^\[]*password *= *([^\r\n]*)/',$cnfFile,$match)) {
                 $password = $match[1];
         } else {