show checkbox as checked or not

darcs-hash:20080626182705-34904-893d72f480c330beb2d8f871da0d2cd9b902ffbf.gz

diff --git a/actions/imsettings.php b/actions/imsettings.php
index a5e9be307ea5a9cb027a32d4e227329537a1946c..18666e1708e9cb691a0151bcc8e4356a6234fdef 100644 (file)
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -79,9 +79,11 @@ class ImsettingsAction extends SettingsAction {
                common_element('h2', NULL, _t('Preferences'));
 
                common_checkbox('jabbernotify',
-                               _t('Send me notices through Jabber/GTalk.'));
+                               _t('Send me notices through Jabber/GTalk.'),
+                               $user->jabbernotify);
                common_checkbox('updatefrompresence',
-                               _t('Post a notice when my Jabber/GTalk status changes.'));
+                               _t('Post a notice when my Jabber/GTalk status changes.'),
+                               $user->updatefrompresence);
                common_submit('save', _t('Save'));
 
                common_element_end('form');

diff --git a/lib/util.php b/lib/util.php
index a20f64c85ffdb6ba0b1dba10358edac41c394ccd..e3c00b31d9dc6704ab304a089b598722b7a68e3f 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -319,16 +319,18 @@ function common_input($id, $label, $value=NULL,$instructions=NULL) {
        common_element_end('p');
 }
 
-function common_checkbox($id, $label, $instructions=NULL, $value='true')
+function common_checkbox($id, $label, $checked=false, $instructions=NULL, $value='true')
 {
        common_element_start('p');
        $attrs = array('name' => $id,
                                   'type' => 'checkbox',
-                                  'id' => $id,
-                                  'value' => $value);
+                                  'id' => $id);
        if ($value) {
                $attrs['value'] = htmlspecialchars($value);
        }
+       if ($checked) {
+               $attrs['checked'] = 'checked';
+       }
        common_element('input', $attrs);
        # XXX: use a <label>
        common_text(' ');