CC-4848: Streaming server passwords should be hidden with dots, once entered

-fixed
2013-01-16 14:36:56 -05:00 · 2013-01-16 14:36:56 -05:00 · f7e8fd33fd
commit f7e8fd33fd
parent 9cb4633823
4 changed files with 60 additions and 4 deletions
--- a/airtime_mvc/application/models/StreamSetting.php
+++ b/airtime_mvc/application/models/StreamSetting.php
@ -242,7 +242,14 @@ class Application_Model_StreamSetting
                        $v = $d['enable'] == 1 ? 'true' : 'false';
                    }
                    $v = trim($v);
-                    self::saveStreamSetting($keyname, $v);
+                    if ($k != 'admin_pass') {
+                        self::saveStreamSetting($keyname, $v);
+                    /* We use 'xxxxxx' as the admin password placeholder so we
+                     * only want to save it when it is a different string
+                     */
+                    } elseif ($v != 'xxxxxx') {
+                        self::saveStreamSetting($keyname, $v);
+                    }
                }
            }
        }