Only in nodequeue: .DS_Store Common subdirectories: nodequeue_orig/help and nodequeue/help Common subdirectories: nodequeue_orig/images and nodequeue/images diff -up nodequeue_orig/nodequeue.actions.inc nodequeue/nodequeue.actions.inc --- nodequeue_orig/nodequeue.actions.inc 2008-05-29 17:42:47.000000000 -0400 +++ nodequeue/nodequeue.actions.inc 2008-08-08 17:11:18.000000000 -0400 @@ -40,6 +40,7 @@ function nodequeue_add_action_form($cont } $queues = nodequeue_load_queues(nodequeue_get_all_qids(500)); + foreach ($queues as $qid => $queue) { $options[$qid] = $queue->title; } @@ -65,9 +66,9 @@ function nodequeue_add_action_form($cont /** * Submit handler for Add to Nodequeues action configuration. */ -function nodequeue_add_action_submit($form_id, $form_values) { +function nodequeue_add_action_submit($form, &$form_state) { return array( - 'qids' => $form_values['qids'], + 'qids' => $form_state['values']['qids'], ); } @@ -205,23 +206,25 @@ function nodequeue_remove_action_form($c /** * Submit handler for Remove from Nodequeues action configuration. */ -function nodequeue_remove_action_submit($form_id, $form_values) { +function nodequeue_remove_action_submit($form, &$form_state) { return array( - 'qids' => $form_values['qids'], + 'qids' => $form_state['values']['qids'], ); } function nodequeue_remove_action($node, $context) { $qids = $context['qids']; // If a node is being deleted, ensure it's also removed from any queues. - $placeholders = implode(',', array_fill(0, count($qids), '%d')); - $args = $qids; - $args[] = $node->nid; - $result = db_query("SELECT * FROM {nodequeue_nodes} WHERE qid IN ($placeholders) AND nid = %d", $args); - while ($obj = db_fetch_object($result)) { - // This removes by nid, not position, because if we happen to have a - // node in a queue twice, the 2nd position would be wrong. - nodequeue_subqueue_remove_node($obj->sqid, $node->nid); + if (count($qids) > 0) { + $placeholders = implode(',', array_fill(0, count($qids), '%d')); + $args = $qids; + $args[] = $node->nid; + $result = db_query("SELECT * FROM {nodequeue_nodes} WHERE qid IN ($placeholders) AND nid = %d", $args); + while ($obj = db_fetch_object($result)) { + // This removes by nid, not position, because if we happen to have a + // node in a queue twice, the 2nd position would be wrong. + nodequeue_subqueue_remove_node($obj->sqid, $node->nid); + } } } diff -up nodequeue_orig/nodequeue.module nodequeue/nodequeue.module --- nodequeue_orig/nodequeue.module 2008-06-09 14:00:59.000000000 -0400 +++ nodequeue/nodequeue.module 2008-08-08 15:25:02.000000000 -0400 @@ -1,5 +1,5 @@ $old_pos) { - if ($sql) { - $sql .= ', '; - } - $sql .= ' (%d, %d, %d, %d, %d)'; + $sql = ' (%d, %d, %d, %d, %d)'; + $args = array(); $args[] = $form_state['values']['sqid']; $args[] = $form_state['values']['qid']; $args[] = $nids[$old_pos]; @@ -1155,9 +1153,9 @@ function nodequeue_arrange_subqueue_form $args[] = $new_pos + 1; $args[] = $now; $subqueue->count++; + $sql = "INSERT INTO {nodequeue_nodes} (sqid, qid, nid, position, timestamp) VALUES $sql"; + db_query($sql, $args); } - $sql = "INSERT INTO {nodequeue_nodes} (sqid, qid, nid, position, timestamp) VALUES $sql"; - db_query($sql, $args); if ($queue->size) { // 0 means infinity so never do this if false nodequeue_check_subqueue_size($queue, $subqueue); @@ -1551,7 +1549,7 @@ function nodequeue_get_qids($type, $acco $roles_join = "INNER JOIN {nodequeue_roles} nr ON nr.qid = nq.qid "; $roles = array_keys((array) $account->roles) + array(DRUPAL_AUTHENTICATED_RID); - $roles_where .= "AND nr.rid IN (". db_placeholders($role_args, 'int') .")"; + $roles_where .= "AND nr.rid IN (". db_placeholders($roles, 'int') .")"; } $sql = 'SELECT nq.qid, nq.show_in_tab, nq.show_in_links, show_in_ui '. @@ -1629,7 +1627,7 @@ function nodequeue_load_queues($qids) { if (!empty($to_load)) { $placeholders = db_placeholders($to_load, 'int'); - $result = db_query("SELECT q.*, COUNT(s.sqid) AS subqueues FROM {nodequeue_queue} q LEFT JOIN {nodequeue_subqueue} s ON q.qid = s.qid WHERE q.qid IN ($placeholders) GROUP BY q.qid", $to_load); + $result = db_query("SELECT q.qid, q.title, q.subqueue_title, q.size, q.link, q.link_remove, q.owner, q.show_in_ui, q.show_in_links, q.reference, q.reverse, COUNT(s.sqid) AS subqueues FROM {nodequeue_queue} q LEFT JOIN {nodequeue_subqueue} s ON q.qid = s.qid WHERE q.qid IN ($placeholders) GROUP BY q.qid, q.title, q.subqueue_title, q.size, q.link, q.link_remove, q.owner, q.show_in_ui, q.show_in_links, q.reference, q.reverse", $to_load); while ($queue = db_fetch_object($result)) { $cache[$queue->qid] = $queue; // ensure valid defaults: @@ -1692,7 +1690,7 @@ function nodequeue_load_subqueues($sqids if (!empty($to_load)) { $placeholders = db_placeholders($to_load, 'int'); - $result = db_query("SELECT s.*, COUNT(n.position) AS count FROM {nodequeue_subqueue} s LEFT JOIN {nodequeue_nodes} n ON n.sqid = s.sqid WHERE s.sqid IN ($placeholders) GROUP BY s.sqid", $to_load); + $result = db_query("SELECT s.sqid, s.qid, s.reference, s.title, COUNT(n.position) AS count FROM {nodequeue_subqueue} s LEFT JOIN {nodequeue_nodes} n ON n.sqid = s.sqid WHERE s.sqid IN ($placeholders) GROUP BY s.sqid, s.qid, s.reference, s.title", $to_load); while ($obj = db_fetch_object($result)) { // Sometimes we want to get to subqueues by reference, sometimes by sqid. // sqid is always unique, but reference is sometimes more readily available. @@ -1743,7 +1741,7 @@ function nodequeue_load_subqueues_by_que return array(); } - $query = "SELECT s.*, COUNT(n.position) AS count FROM {nodequeue_subqueue} s LEFT JOIN {nodequeue_nodes} n ON n.sqid = s.sqid WHERE s.qid IN (". db_placeholders($qids, 'int') .") GROUP BY s.sqid"; + $query = "SELECT s.qid, s.sqid, s.reference, s.title, COUNT(n.position) AS count FROM {nodequeue_subqueue} s LEFT JOIN {nodequeue_nodes} n ON n.sqid = s.sqid WHERE s.qid IN (". db_placeholders($qids, 'int') .") GROUP BY s.qid, s.sqid, s.reference, s.title"; if ($page_size) { $result = pager_query($query, $page_size, 0, $qids); } @@ -1807,7 +1805,7 @@ function nodequeue_load_subqueues_by_ref $where .= 's.qid = %d AND s.reference IN ('. implode(', ', $key_list) .')'; } - $result = db_query("SELECT s.*, COUNT(n.position) AS count FROM {nodequeue_subqueue} s LEFT JOIN {nodequeue_nodes} n ON n.sqid = s.sqid WHERE $where GROUP BY s.sqid", $values); + $result = db_query("SELECT s.sqid, s.qid, s.reference, s.title, COUNT(n.position) AS count FROM {nodequeue_subqueue} s LEFT JOIN {nodequeue_nodes} n ON n.sqid = s.sqid WHERE $where GROUP BY s.sqid, s.qid, s.reference, s.title", $values); while ($subqueue = db_fetch_object($result)) { $cache[$subqueue->qid][$subqueue->reference] = $subqueues[$subqueue->sqid] = $subqueue; @@ -2537,3 +2535,4 @@ function nodequeue_get_token($nid) { function nodequeue_check_token($seed) { return drupal_get_token($seed) == $_GET['token']; } + Common subdirectories: nodequeue_orig/translations and nodequeue/translations