X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fsvc_domain.cgi;h=5abe9d6b5e87824cddc0d3b799881eddaf79ee12;hb=22e59cf0fddecd4808a6ce91fe2b1712f3ab3c87;hp=b19e9ee1528ffa053dc0eae191825f837da11613;hpb=7a8c7b6f64ac14d555d866f93300e64c47b74a98;p=freeside.git

diff --git a/httemplate/edit/svc_domain.cgi b/httemplate/edit/svc_domain.cgi
index b19e9ee15..5abe9d6b5 100755
--- a/httemplate/edit/svc_domain.cgi
+++ b/httemplate/edit/svc_domain.cgi
@@ -220,11 +220,17 @@ Account defaults
     </TD>
   </TR>
 
-  <% include('/elements/tr-input-text.html',
+  <% include('/elements/tr-select.html',
                'label'      => 'On logout remove trash',
+               'field'      => 'acct_def_cgp_emptytrash',
+               'options'    => $svc_domain->cgp_emptytrash_values,
+               'labels'     => {
+                                 '' => 'default (92 days)', #right?
+                               },
                'curr_value' => $svc_domain->acct_def_cgp_emptytrash,
             )
   %>
+
   <% include('/elements/tr-select.html',
                'label'      => 'Language',
                'field'      => 'acct_def_cgp_language',
@@ -239,69 +245,7 @@ Account defaults
   <% include('/elements/tr-select.html',
                'label'      => 'Time zone',
                'field'      => 'acct_def_cgp_timezone',
-               'options'    => [
-                                 'HostOS',
-                                 '(+0100) Algeria/Congo',
-                                 '(+0200) Egypt/South Africa',
-                                 '(+0300) Saudi Arabia',
-                                 '(+0400) Oman',
-                                 '(+0500) Pakistan',
-                                 '(+0600) Bangladesh',
-                                 '(+0700) Thailand/Vietnam',
-                                 '(+0800) China/Malaysia',
-                                 '(+0900) Japan/Korea',
-                                 '(+1000) Queensland',
-                                 '(+1100) Micronesia',
-                                 '(+1200) Fiji',
-                                 '(+1300) Tonga/Kiribati',
-                                 '(+1400) Christmas Islands',
-                                 '(-0100) Azores/Cape Verde',
-                                 '(-0200) Fernando de Noronha',
-                                 '(-0300) Argentina/Uruguay',
-                                 '(-0400) Venezuela/Guyana',
-                                 '(-0500) Haiti/Peru',
-                                 '(-0600) Central America',
-                                 '(-0700) Arisona',
-                                 '(-0800) Adamstown',
-                                 '(-0900) Marquesas Islands',
-                                 '(-1000) Hawaii/Tahiti',
-                                 '(-1100) Samoa',
-                                 'Asia/Afghanistan',
-                                 'Asia/India',
-                                 'Asia/Iran',
-                                 'Asia/Iraq',
-                                 'Asia/Israel',
-                                 'Asia/Jordan',
-                                 'Asia/Lebanon',
-                                 'Asia/Syria',
-                                 'Australia/Adelaide',
-                                 'Australia/East',
-                                 'Australia/NorthernTerritory',
-                                 'Europe/Central',
-                                 'Europe/Eastern',
-                                 'Europe/Moscow',
-                                 'Europe/Western',
-                                 'GMT (+0000)',
-                                 'Newfoundland',
-                                 'NewZealand/Auckland',
-                                 'NorthAmerica/Alaska',
-                                 'NorthAmerica/Atlantic',
-                                 'NorthAmerica/Central',
-                                 'NorthAmerica/Eastern',
-                                 'NorthAmerica/Mountain',
-                                 'NorthAmerica/Pacific',
-                                 'Russia/Ekaterinburg',
-                                 'Russia/Irkutsk',
-                                 'Russia/Kamchatka',
-                                 'Russia/Krasnoyarsk',
-                                 'Russia/Magadan',
-                                 'Russia/Novosibirsk',
-                                 'Russia/Vladivostok',
-                                 'Russia/Yakutsk',
-                                 'SouthAmerica/Brasil',
-                                 'SouthAmerica/Chile',
-                                 'SouthAmerica/Paraguay',
-                               ],
+               'options'    => $svc_domain->cgp_timezone_values,
                'labels'     => {
                                  '' => 'default (HostOS)',
                                },