';
}
else {
@@ -1018,61 +1137,70 @@
}
- print theme('page', $the_output);
+ return $the_output;
} // function _quotes_blocks
-/**
- * Displays a form for adding or editing a quote block.
- */
-function _quotes_blocks_form($in_bid = 0) {
- if ($_POST['op'] == t('Submit')) {
- $the_name = trim($_POST['edit']['name']);
- $the_title = trim($_POST['edit']['title']);
- $the_type = (($_POST['edit']['type'] == 1) ? 1 : 0);
- $the_nids = trim($_POST['edit']['nid_filter']);
- $the_rids = ($_POST['edit']['rid_filter'] ? implode(',', $_POST['edit']['rid_filter']) : '');
- $the_uids = ($_POST['edit']['uid_filter'] ? implode(',', $_POST['edit']['uid_filter']) : '');
- $the_tids = ($_POST['edit']['tid_filter'] ? implode(',', $_POST['edit']['tid_filter']) : '');
-
- if (!$the_name) {
- form_set_error('name', t('Please enter a block name.'));
- }
-
- if ($the_nids) {
- if (!preg_match('<^(?:\d+\W+)*\d+$>', $the_nids, $the_nids)) {
- form_set_error('nid_filter', t('Please enter valid node IDs.'));
- }
- else {
- $the_nids = preg_replace('<\W+>', ',', $the_nids[0]);
- }
- }
- if (!form_get_errors()) {
- if ($in_bid) {
- if (db_query("UPDATE {quotes_blocks} SET name = '%s', title = '%s', block_type = %d, nid_filter = '%s', rid_filter = '%s', uid_filter = '%s', tid_filter = '%s' WHERE bid = %d", $the_name, $the_title, $the_type, $the_nids, $the_rids, $the_uids, $the_tids, $in_bid)) {
- drupal_set_message(t('Block %name successfully updated.', array('%name' => $the_name)));
- drupal_goto("admin/quotes/blocks");
- }
- else {
- drupal_set_message(t('Block %name could not be updated.', array('%name' => $the_name)), 'error');
- }
- }
- else {
- $the_id = db_next_id('{quotes}_bid');
- if (db_query("INSERT INTO {quotes_blocks} (bid, name, title, block_type, nid_filter, rid_filter, uid_filter, tid_filter) VALUES (%d, '%s', '%s', %d, '%s', '%s', '%s', '%s')", $the_id, $the_name, $the_title, $the_type, $the_nids, $the_rids, $the_uids, $the_tids)) {
- drupal_set_message(t('Block %name successfully created.', array('%name' => $the_name)));
- drupal_goto("admin/quotes/blocks");
- }
- else {
- drupal_set_message(t('Block %name could not be created.', array('%name' => $the_name)), 'error');
- }
- }
+function quotes_blocks_form_validate($form_id, $form_values) {
+ $the_name = trim($form_values['name']);
+ $the_nids = trim($form_values['nid_filter']);
+ if (!$the_name) {
+ form_set_error('name', t('Please enter a block name.'));
+ }
+
+ if ($the_nids) {
+ if (!preg_match('<^(?:\d+\W+)*\d+$>', $the_nids, $the_nids)) {
+ form_set_error('nid_filter', t('Please enter valid node IDs.'));
+ }
+ }
+} // function _quotes_blocks_validate
+
+function quotes_blocks_form_submit($form_id, $form_values) {
+ $in_bid = arg(3);
+ $the_name = trim($form_values['name']);
+ $the_title = trim($form_values['title']);
+ $the_type = (($form_values['type'] == 1) ? 1 : 0);
+ $the_nids = trim($form_values['nid_filter']);
+ $the_rids = ($form_values['rid_filter'] ? implode(',', $form_values['rid_filter']) : '');
+ $the_uids = ($form_values['uid_filter'] ? implode(',', $form_values['uid_filter']) : '');
+ $the_tids = ($form_values['tid_filter'] ? implode(',', $form_values['tid_filter']) : '');
+
+ //this should have been validated already
+ preg_match('<^(?:\d+\W+)*\d+$>', $the_nids, $the_nids);
+ $the_nids = preg_replace('<\W+>', ',', $the_nids[0]);
+
+ if ($in_bid) {
+ if (db_query("UPDATE {quotes_blocks} SET name = '%s', title = '%s', block_type = %d, nid_filter = '%s', rid_filter = '%s', uid_filter = '%s', tid_filter = '%s' WHERE bid = %d", $the_name, $the_title, $the_type, $the_nids, $the_rids, $the_uids, $the_tids, $in_bid)) {
+ drupal_set_message(t('Block %name successfully updated.', array('%name' => $the_name)));
+ drupal_goto("admin/quotes/blocks");
+ }
+ else {
+ drupal_set_message(t('Block %name could not be updated.', array('%name' => $the_name)), 'error');
}
}
- elseif ($in_bid) {
- $_POST['edit'] = db_fetch_array(db_query("SELECT qb.* FROM {quotes_blocks} qb WHERE bid = %d", $in_bid));
- $_POST['edit']['rid_filter'] = explode(',', $_POST['edit']['rid_filter']);
- $_POST['edit']['uid_filter'] = explode(',', $_POST['edit']['uid_filter']);
- $_POST['edit']['tid_filter'] = explode(',', $_POST['edit']['tid_filter']);
+ else {
+ $the_id = db_next_id('{quotes}_bid');
+
+ if (db_query("INSERT INTO {quotes_blocks} (bid, name, title, block_type, nid_filter, rid_filter, uid_filter, tid_filter) VALUES (%d, '%s', '%s', %d, '%s', '%s', '%s', '%s')", $the_id, $the_name, $the_title, $the_type, $the_nids, $the_rids, $the_uids, $the_tids)) {
+ drupal_set_message(t('Block %name successfully created.', array('%name' => $the_name)));
+ drupal_goto("admin/quotes/blocks");
+ }
+ else {
+ drupal_set_message(t('Block %name could not be created.', array('%name' => $the_name)), 'error');
+ }
+ }
+} // function _quotes_blocks_submit
+
+
+
+/**
+ * Displays a form for adding or editing a quote block.
+ */
+function _quotes_blocks_form($in_bid = 0) {
+ if ($in_bid) {
+ $editvals = db_fetch_array(db_query("SELECT qb.* FROM {quotes_blocks} qb WHERE bid = %d", $in_bid));
+ $editvals['rid_filter'] = explode(',', $editvals['rid_filter']);
+ $editvals['uid_filter'] = explode(',', $editvals['uid_filter']);
+ $editvals['tid_filter'] = explode(',', $editvals['tid_filter']);
}
@@ -1088,21 +1216,74 @@
}
- $the_form = form_textfield(t('Name'), 'name', $_POST['edit']['name'], 40, 255, t('Enter a unique name for this block. This will identify the block on the %link.', array('%link' => l('block administration page', 'admin/block'))), NULL, TRUE);
- $the_form .= form_textfield(t('Block title'), 'title', $_POST['edit']['title'], 40, 255, t('Enter the title that will be used for this block when displayed. If desired, you can include the string %title which will be replaced by the title of the quote being displayed in the block.'));
- $the_form .= form_radios(t('Type'), 'type', ($_POST['edit']['type'] ? $_POST['edit']['type'] : 0), array(t('Random'), t('Most recent')), NULL, TRUE);
- $the_form .= form_textarea(t('Node filter'), 'nid_filter', $_POST['edit']['nid_filter'], 40, 4, t('To restrict this block to display only certain quotes based on node IDs, enter the IDs here separated by commas, spaces, or returns.'));
+ $form['name'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Name'),
+ '#default_value' => $editvals['name'],
+ '#size' => 40,
+ '#maxlength' => 255,
+ '#description' => t('Enter a unique name for this block. This will identify the block on the %link.', array('%link' => l('block administration page', 'admin/block'))),
+ '#required' => TRUE,
+ );
+ $form['title'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Block title'),
+ '#default_value' => $editvals['title'],
+ '#size' => 40,
+ '#maxlength' => 255,
+ '#description' => t('Enter the title that will be used for this block when displayed. If desired, you can include the string %title which will be replaced by the title of the quote being displayed in the block.'),
+ );
+ $form['type'] = array(
+ '#type' => 'radios',
+ '#title' => t('Type'),
+ '##default_value' => ($editvals['type'] ? $editvals['type'] : 0),
+ '#options' => array(t('Random'), t('Most recent')),
+ '#description' => NULL,
+ '#required' => TRUE,
+ );
+ $form['nid_filter'] = array(
+ '#type' => 'textarea',
+ '#title' => t('Node filter'),
+ '#default_value' => $editvals['nid_filter'],
+ '#cols' => 40,
+ '#rows' => 4,
+ '#description' => t('To restrict this block to display only certain quotes based on node IDs, enter the IDs here separated by commas, spaces, or returns.'),
+ );
if (count($the_roles)) {
- $the_form .= form_select(t('Role filter'), 'rid_filter', $_POST['edit']['rid_filter'], $the_roles, t('To restrict this block to display only quotes submitted by users in specific roles, select the roles here.'), NULL, TRUE);
+ $form['rid_filter'] = array(
+ '#type' => 'select',
+ '#title' => t('Role filter'),
+ '##default_value' => $editvals['rid_filter'],
+ '#options' => $the_roles,
+ '#description' => t('To restrict this block to display only quotes submitted by users in specific roles, select the roles here.'),
+ '#extra' => NULL,
+ '#multiple' => TRUE,
+ );
}
else {
- $the_form .= form_item(t('Role filter'), t('There are no roles configured with the edit own quotes permission, so no roles are available. To filter by role, please assign this permission to at least one role on the %link.', array('%link' => l(t('permission administration page'), 'admin/access'))));
+ $form[] = array(
+ '#type' => 'item',
+ '#title' => t('Role filter'),
+ '#default_value' => t('There are no roles configured with the edit own quotes permission, so no roles are available. To filter by role, please assign this permission to at least one role on the %link.', array('%link' => l(t('permission administration page'), 'admin/access'))),
+ );
}
if (count($the_users)) {
- $the_form .= form_select(t('User filter'), 'uid_filter', $_POST['edit']['uid_filter'], $the_users, t('To restrict this block to display only quotes submitted by specific users, select the users here.'), NULL, TRUE);
+ $form['uid_filter'] = array(
+ '#type' => 'select',
+ '#title' => t('User filter'),
+ '##default_value' => $editvals['uid_filter'],
+ '#options' => $the_users,
+ '#description' => t('To restrict this block to display only quotes submitted by specific users, select the users here.'),
+ '#extra' => NULL,
+ '#multiple' => TRUE,
+ );
}
else {
- $the_form .= form_item(t('User filter'), t('There are no users with the edit own quotes permission, so no users are available. To filter by user, please assign at least one user to a role with this permission on the %link.', array('%link' => l(t('user administration page'), 'admin/user'))));
+ $form['user_filter'] = array(
+ '#type' => 'item',
+ '#title' => t('User filter'),
+ '#value' => t('There are no users with the edit own quotes permission, so no users are available. To filter by user, please assign at least one user to a role with this permission on the %link.', array('%link' => l(t('user administration page'), 'admin/user'))),
+ );
}
@@ -1114,20 +1295,31 @@
while ($the_voc = db_fetch_object($the_result)) {
$the_voc = taxonomy_get_vocabulary($the_voc->vid);
- $the_group .= _taxonomy_term_select($the_voc->name, 'tid_filter', $_POST['edit']['tid_filter'], $the_voc->vid, $the_voc->help, TRUE, FALSE);
+ $the_group .= _taxonomy_term_select($the_voc->name, 'tid_filter', $editvals['tid_filter'], $the_voc->vid, $the_voc->help, TRUE, FALSE);
}
if ($the_group) {
- $the_form .= form_group(t('Category filter'), $the_group, t('To restrict this block to display only quotes in specific categories, select the categories here.'));
+ $form['category_filter'] = array(
+ '#type' => 'fieldset',
+ '#title' => t('Category filter'),
+ '#description' => t('To restrict this block to display only quotes in specific categories, select the categories here.'),
+ );
}
else {
- $the_form .= form_item(t('Category filter'), t('There are no vocabularies assigned to quotes. To filter by categories, please assign at least one vocabulary to quotes on the %link.', array('%link' => l(t('category administration page'), 'admin/taxonomy'))));
+ $form[] = array(
+ '#type' => 'item',
+ '#title' => t('Category filter'),
+ '#default_value' => t('There are no vocabularies assigned to quotes. To filter by categories, please assign at least one vocabulary to quotes on the %link.', array('%link' => l(t('category administration page'), 'admin/taxonomy'))),
+ );
}
}
+
+ $form['submit'] = array(
+ '#type' => 'submit',
+ '#value' => t('Submit')
+ );
+
+ $the_output .= drupal_get_form('quotes_blocks_form', $form);
- $the_form .= form_submit(t('Submit'));
-
- $the_output .= form($the_form);
-
- print theme('page', $the_output);
+ return $the_output;
} // function _quotes_blocks_form
@@ -1135,17 +1327,32 @@
* Confirms and deletes a quote block.
*/
-function _quotes_blocks_delete($in_bid) {
+function _quotes_blocks_delete() {
+ $in_bid = arg(3);
$the_block = db_fetch_object(db_query('SELECT qb.name FROM {quotes_blocks} qb WHERE qb.bid = %d', $in_bid));
-
- if ($_POST['op'] == t('Delete')) {
- db_query("DELETE FROM {quotes_blocks} WHERE bid = %d", $in_bid);
- drupal_set_message(t('Block %name deleted.', array('%name' => $the_block->name)));
- drupal_goto('admin/quotes/blocks');
- }
-
$the_output = t('
Are you sure you want to delete the block %name?', array('%name' => $the_block->name));
- $the_output .= form(form_submit(t('Delete')));
+
+ if (!$the_block)
+ return t('