diff options
| author | thomascube <thomas@roundcube.net> | 2008-04-12 13:54:45 +0000 |
|---|---|---|
| committer | thomascube <thomas@roundcube.net> | 2008-04-12 13:54:45 +0000 |
| commit | 47124c2279382714afd8dbe4a867a867ea179199 (patch) | |
| tree | 9ce67f4521f466d8718604a23d74de1786189efd /program/steps/addressbook | |
| parent | b00bd0f27d1c066d04fc8124c3a35465a5933ab1 (diff) | |
Changed codebase to PHP5 with autoloader + added some new classes from the devel-vnext branch
Diffstat (limited to 'program/steps/addressbook')
| -rw-r--r-- | program/steps/addressbook/edit.inc | 6 | ||||
| -rw-r--r-- | program/steps/addressbook/func.inc | 7 |
2 files changed, 5 insertions, 8 deletions
diff --git a/program/steps/addressbook/edit.inc b/program/steps/addressbook/edit.inc index 47db7197d..e3218a35e 100644 --- a/program/steps/addressbook/edit.inc +++ b/program/steps/addressbook/edit.inc @@ -89,7 +89,7 @@ function get_form_tags($attrib) $form_start = ''; if (!strlen($EDIT_FORM)) { - $hiddenfields = new hiddenfield(array('name' => '_task', 'value' => $GLOBALS['_task'])); + $hiddenfields = new html_hiddenfield(array('name' => '_task', 'value' => $GLOBALS['_task'])); $hiddenfields->add(array('name' => '_action', 'value' => 'save', 'source' => get_input_value('_source', RCUBE_INPUT_GPC))); if (($result = $CONTACTS->get_result()) && ($record = $result->first())) @@ -114,8 +114,8 @@ function get_form_tags($attrib) if (!$CONTACTS->get_result() && template_exists('addcontact')) - parse_template('addcontact'); + $OUTPUT->send('addcontact'); // this will be executed if no template for addcontact exists -parse_template('editcontact'); +$OUTPUT->send('editcontact'); ?>
\ No newline at end of file diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc index b916ad796..28b540ac8 100644 --- a/program/steps/addressbook/func.inc +++ b/program/steps/addressbook/func.inc @@ -19,9 +19,6 @@ */ -require_once('include/rcube_contacts.inc'); -require_once('include/rcube_ldap.inc'); - // instantiate a contacts object according to the given source if (($source = get_input_value('_source', RCUBE_INPUT_GPC)) && isset($CONFIG['ldap_public'][$source])) $CONTACTS = new rcube_ldap($CONFIG['ldap_public'][$source]); @@ -157,7 +154,7 @@ function rcmail_js_contacts_list($result, $prefix='') // format each col foreach ($a_show_cols as $col) - $a_row_cols[$col] = $row[$col]; + $a_row_cols[$col] = Q($row[$col]); $OUTPUT->command($prefix.'add_contact_row', $row['ID'], $a_row_cols); } @@ -231,7 +228,7 @@ $OUTPUT->add_handlers(array( 'addresslist' => 'rcmail_contacts_list', 'addressframe' => 'rcmail_contact_frame', 'recordscountdisplay' => 'rcmail_rowcount_display', - 'searchform' => 'rcmail_search_form' + 'searchform' => array($OUTPUT, 'search_form') )); ?> |