diff --git a/status/CHANGELOG b/status/CHANGELOG index 6cce3d3f3..45f01c023 100644 --- a/status/CHANGELOG +++ b/status/CHANGELOG @@ -69,3 +69,4 @@ Added a new monitor type for detecting large directories. Added a button to the main page for refreshing only selected monitors, thanks to Michael Mansour. ---- Changes since 1.500 ---- Added an option to the Disk Space monitor to alert based on percentage free, as an alternative to a threshold in bytes. +Put back the option to use Cingular as an SMS carrier. diff --git a/status/edit_sched.cgi b/status/edit_sched.cgi index c919edf70..095a5f7d9 100755 --- a/status/edit_sched.cgi +++ b/status/edit_sched.cgi @@ -78,7 +78,9 @@ print &ui_table_row($text{'sched_sms'}, [ [ 1, $text{'sched_smsno'} ], [ 0, $text{'sched_smscarrier'} ] ])."\n". &ui_select("carrier", $config{'sched_carrier'}, - [ map { [ $_->{'id'}, $_->{'desc'} ] } &list_sms_carriers() ])."\n". + [ map { [ $_->{'id'}, $_->{'desc'} ] } + sort { lc($a->{'desc'}) cmp lc($b->{'desc'}) } + &list_sms_carriers() ])."\n". $text{'sched_smsnumber'}." ". &ui_textbox("sms", $config{'sched_sms'}, 15), 3); diff --git a/status/lang/en b/status/lang/en index 7da171759..734757347 100644 --- a/status/lang/en +++ b/status/lang/en @@ -166,6 +166,7 @@ sched_smsno=Nobody sched_smscarrier=Phone on carrier sched_smsnumber=with number sched_esmsnumber=Missing or non-numeric SMS number +sched_esmsname=Missing or invalid-looking SMS number up_since=Up since $1 depends_mod=The module $1 is not installed on your system diff --git a/status/save_sched.cgi b/status/save_sched.cgi index cd1e26c19..413aefa59 100755 --- a/status/save_sched.cgi +++ b/status/save_sched.cgi @@ -19,7 +19,14 @@ if ($in{'sms_def'}) { } else { $config{'sched_carrier'} = $in{'carrier'}; - $in{'sms'} =~ /^\d+$/ || &error($text{'sched_esmsnumber'}); + ($carrier) = grep { $_->{'id'} eq $in{'carrier'} } + &list_sms_carriers(); + if ($carrier->{'alpha'}) { + $in{'sms'} =~ /^\S+$/ || &error($text{'sched_esmsname'}); + } + else { + $in{'sms'} =~ /^\d+$/ || &error($text{'sched_esmsnumber'}); + } $config{'sched_sms'} = $in{'sms'}; } if ($in{'from_def'}) { diff --git a/status/status-lib.pl b/status/status-lib.pl index 71955bb3b..68dfd45da 100755 --- a/status/status-lib.pl +++ b/status/status-lib.pl @@ -399,6 +399,10 @@ return ( { 'id' => 'tmobile', { 'id' => 'cingular', 'desc' => 'AT&T', 'domain' => 'txt.att.net' }, + { 'id' => 'oldcingular', + 'desc' => 'Cingular', + 'domain' => 'cingularme.com', + 'alpha' => 1 }, { 'id' => 'verizon', 'desc' => 'Verizon', 'domain' => 'vtext.com' },