Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'devel' into 2.3.x-saas

Browse source
This commit is contained in:
Martin Konecny 2013-01-17 10:56:18 -05:00
commit 784cb390d3
11 changed files with 79 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
airtime_mvc/application/models/Preference.php
View file

@ -220,7 +220,7 @@ class Application_Model_Preference
$fade = $out;
}
$fade = number_format($fade, 1);
$fade = number_format($fade, 1, '.', '');
//fades need 2 leading zeros for DateTime conversion
$fade = str_pad($fade, 4, "0", STR_PAD_LEFT);
@ -457,7 +457,12 @@ class Application_Model_Preference
public static function GetUserTimezone($id)
{
return self::getValue("user_timezone", true);
$timezone = self::getValue("user_timezone", true);
if (!$timezone) {
return self::GetDefaultTimezone();
} else {
return $timezone;
}
}
public static function GetTimezone()
@ -484,7 +489,12 @@ class Application_Model_Preference
public static function GetUserLocale($id)
{
return self::getValue("user_locale", true);
$locale = self::getValue("user_locale", true);
if (!$locale) {
return self::GetDefaultLocale();
} else {
return $locale;
}
}
public static function SetUserLocale($userId, $locale = null)

9
airtime_mvc/application/models/StreamSetting.php
View file

@ -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);
}
}
}
}