Index: tests/nodequeue.test
===================================================================
RCS file: /cvs/drupal/contributions/modules/nodequeue/tests/Attic/nodequeue.test,v
retrieving revision 1.1.2.1
diff -r1.1.2.1 nodequeue.test
1a2,3
> // $Id$
>
175c177
< for($i = 0; $i < count($nid_array); $i++) {
---
> for ($i = 0; $i < count($nid_array); $i++) {
234c236
< for($i = 0; $i < count($nid_array); $i++) {
---
> for ($i = 0; $i < count($nid_array); $i++) {
250c252
< for($i = 0; $i < count($nid_array); $i++) {
---
> for ($i = 0; $i < count($nid_array); $i++) {
266c268
< for($i = 0; $i < count($nid_array); $i++) {
---
> for ($i = 0; $i < count($nid_array); $i++) {
282c284
< for($i = 0; $i < count($nid_array); $i++) {
---
> for ($i = 0; $i < count($nid_array); $i++) {
300c302
< for($i = 0; $i < count($nid_array); $i++) {
---
> for ($i = 0; $i < count($nid_array); $i++) {
347,348d348
<
< ?>
\ No newline at end of file
Index: nodequeue.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/nodequeue/nodequeue.module,v
retrieving revision 1.39.2.28.2.30
diff -r1.39.2.28.2.30 nodequeue.module
11c11
< return array ('manipulate queues', 'administer nodequeue', 'manipulate all queues');
---
> return array('manipulate queues', 'administer nodequeue', 'manipulate all queues');
21c21
< include_once drupal_get_path('module', 'nodequeue') . '/nodequeue.actions.inc';
---
> include_once './'. drupal_get_path('module', 'nodequeue') .'/nodequeue.actions.inc';
25c25
< include_once drupal_get_path('module', 'nodequeue') . '/nodequeue.views.inc';
---
> include_once './'. drupal_get_path('module', 'nodequeue') .'/nodequeue.views.inc';
83c83
< 'path' => 'admin/content/nodequeue/add/' . $key,
---
> 'path' => 'admin/content/nodequeue/add/'. $key,
98c98
< 'path' => 'node/' . arg(1) . '/nodequeue',
---
> 'path' => 'node/'. arg(1) .'/nodequeue',
120c120
< 'path' => 'admin/content/nodequeue/' . $queue->qid,
---
> 'path' => 'admin/content/nodequeue/'. $queue->qid,
127c127
< 'path' => 'admin/content/nodequeue/' . $queue->qid . '/view',
---
> 'path' => 'admin/content/nodequeue/'. $queue->qid .'/view',
137c137
< 'path' => 'admin/content/nodequeue/' . $queue->qid . '/edit',
---
> 'path' => 'admin/content/nodequeue/'. $queue->qid .'/edit',
145c145
< 'path' => 'admin/content/nodequeue/' . $queue->qid . '/delete',
---
> 'path' => 'admin/content/nodequeue/'. $queue->qid .'/delete',
230a231
>
235c236
< switch($op) {
---
> switch ($op) {
277c278
< $links['nodequeue-ajax-toggle-' . $subqueue->sqid] = array(
---
> $links['nodequeue-ajax-toggle-'. $subqueue->sqid] = array(
284c285
< $links['nodequeue-ajax-toggle-' . $subqueue->sqid] = array(
---
> $links['nodequeue-ajax-toggle-'. $subqueue->sqid] = array(
425c426
< 'id' => 'nodequeue-count-' . $subqueue->sqid,
---
> 'id' => 'nodequeue-count-'. $subqueue->sqid,
470c471
< $sub_text .= " (" . nodequeue_subqueue_size_text($queue->size, $queue->subqueue->count) . ")";
---
> $sub_text .= " (". nodequeue_subqueue_size_text($queue->size, $queue->subqueue->count) .")";
512c513
< $output = '' . t('Max nodes in queue: @size', array('@size' => $queue->size ? $queue->size : t("Infinite"))) . '
';
---
> $output = ''. t('Max nodes in queue: @size', array('@size' => $queue->size ? $queue->size : t("Infinite"))) .'
';
824,828c825,829
< $output = '';
< $output .= '| ' . l($node->title, "node/$node->nid") . ' | ';
< $output .= '' . theme('username', $node) . ' | ';
< $output .= '' . format_date($node->created) . ' | ';
< $output .= '' . $buttons . ' | ';
---
> $output = '
';
> $output .= '| '. l($node->title, "node/$node->nid") .' | ';
> $output .= ''. theme('username', $node) .' | ';
> $output .= ''. format_date($node->created) .' | ';
> $output .= ''. $buttons .' | ';
852c853
< $output = '' . t('Max nodes in queue: @size', array('@size' => $queue->size ? $queue->size : t("Infinite"))) . '
';
---
> $output = ''. t('Max nodes in queue: @size', array('@size' => $queue->size ? $queue->size : t("Infinite"))) .'
';
861,864c862,865
< $output .= '' . t('Node') . ' | ';
< $output .= '' . t('Author') . ' | ';
< $output .= '' . t('Date') . ' | ';
< $output .= '' . t('Operation') . ' | ';
---
> $output .= ''. t('Node') .' | ';
> $output .= ''. t('Author') .' | ';
> $output .= ''. t('Date') .' | ';
> $output .= ''. t('Operation') .' | ';
866c867
< $output .= '
' . $body . '';
---
> $output .= ''. $body .'';
1057c1058
< return 'admin/content/nodequeue/' . $form_values['qid'] . '/clear/' . $form_values['sqid'];
---
> return 'admin/content/nodequeue/'. $form_values['qid'] .'/clear/'. $form_values['sqid'];
1119c1120,1121
< } else {
---
> }
> else {
1138c1140,1141
< } else {
---
> }
> else {
1157c1160,1161
< } else {
---
> }
> else {
1176c1180,1181
< } else {
---
> }
> else {
1454,1456c1459,1461
< $sql = 'SELECT nq.qid, nq.show_in_tab, nq.show_in_links, show_in_ui ' .
< 'FROM {nodequeue_queue} nq ' .
< 'INNER JOIN {nodequeue_types} nt ON nt.qid = nq.qid ' . $roles_join .
---
> $sql = 'SELECT nq.qid, nq.show_in_tab, nq.show_in_links, show_in_ui '.
> 'FROM {nodequeue_queue} nq '.
> 'INNER JOIN {nodequeue_types} nt ON nt.qid = nq.qid '. $roles_join .
1486,1487c1491,1492
< $sql = 'SELECT nq.qid ' .
< 'FROM {nodequeue_queue} nq ' .
---
> $sql = 'SELECT nq.qid '.
> 'FROM {nodequeue_queue} nq '.
1639c1644
< $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 (" . implode(', ', array_fill(0, count($qids), '%d')) . ") GROUP BY s.sqid";
---
> $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 (". implode(', ', array_fill(0, count($qids), '%d')) .") GROUP BY s.sqid";
1700c1705
< $where .= 's.qid = %d AND s.reference IN (' . implode(', ', $key_list) . ')';
---
> $where .= 's.qid = %d AND s.reference IN ('. implode(', ', $key_list) .')';
1734c1739
< foreach($queue->roles as $rid)
---
> foreach ($queue->roles as $rid)
1739c1744
< foreach($queue->types as $type)
---
> foreach ($queue->types as $type)
1744c1749
< if (db_result(db_query("SELECT COUNT(*) FROM {nodequeue_queue} WHERE link != ''"))) {
---
> if (db_result(db_query("SELECT COUNT(*) FROM {nodequeue_queue} WHERE link <> ''"))) {
2196c2201
< $sqid = db_result(db_query("SELECT sqid FROM {nodequeue_subqueue} WHERE qid = %d LIMIT 1", $qid));
---
> $sqid = db_result(db_query_range("SELECT sqid FROM {nodequeue_subqueue} WHERE qid = %d", array($qid), 0, 1));
2212c2217
< $function = $queue->owner . "_nodequeue_form";
---
> $function = $queue->owner ."_nodequeue_form";
2229c2234
< $function = $queue->owner . "_nodequeue_form_validate";
---
> $function = $queue->owner ."_nodequeue_form_validate";
2245c2250
< $function = $queue->owner . "_nodequeue_form_submit";
---
> $function = $queue->owner ."_nodequeue_form_submit";
2262c2267
< $function = $queue->owner . "_nodequeue_form_submit_finish";
---
> $function = $queue->owner ."_nodequeue_form_submit_finish";
2281c2286
< $function = $queue->owner . "_nodequeue_subqueues";
---
> $function = $queue->owner ."_nodequeue_subqueues";
2312c2317
< $where = "n.type IN (" . implode(', ', array_fill(0, count($queue->types), "'%s'")) . ')';
---
> $where = "n.type IN (". implode(', ', array_fill(0, count($queue->types), "'%s'")) .')';
2334c2339
< $function = $queue->owner . "_nodequeue_autocomplete";
---
> $function = $queue->owner ."_nodequeue_autocomplete";
2341c2346
< $matches[$node->nid] = check_plain($node->title) . " [nid: $node->nid]";
---
> $matches[$node->nid] = check_plain($node->title) ." [nid: $node->nid]";
2411c2416
< return 'token=' . drupal_get_token($nid);
---
> return 'token='. drupal_get_token($nid);
Index: nodequeue.views.inc
===================================================================
RCS file: /cvs/drupal/contributions/modules/nodequeue/Attic/nodequeue.views.inc,v
retrieving revision 1.1.2.17
diff -r1.1.2.17 nodequeue.views.inc
30c30
< 'help' => t('Display the time the node was added to a given node queue.').' '.
---
> 'help' => t('Display the time the node was added to a given node queue.') .' '.
228c228
< $view->url = 'nodequeue/' . $queue->qid;
---
> $view->url = 'nodequeue/'. $queue->qid;
245,246c245,246
< $view->sort = array (
< array (
---
> $view->sort = array(
> array(
253c253
< $view->argument = array (
---
> $view->argument = array(
255,256c255,256
< $view->field = array (
< array (
---
> $view->field = array(
> array(
264c264
< $view->exposed_filter = array (
---
> $view->exposed_filter = array(
267,268c267,268
< $view->filter = array (
< array (
---
> $view->filter = array(
> array(
317c317
< switch($op) {
---
> switch ($op) {
343c343
< switch($op) {
---
> switch ($op) {
376c376
< switch($op) {
---
> switch ($op) {
407c407
< switch($op) {
---
> switch ($op) {
Index: nodequeue_generate.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/nodequeue/Attic/nodequeue_generate.module,v
retrieving revision 1.1.2.2
diff -r1.1.2.2 nodequeue_generate.module
18c18
< $form['help'] = array('#value' => ''. t('Select which node queues shall be emptied and re-populated with new nodes.'). '
');
---
> $form['help'] = array('#value' => ''. t('Select which node queues shall be emptied and re-populated with new nodes.') .'
');
43c43
< $sub_text .= " (" . nodequeue_subqueue_size_text($queue->size, $queue->subqueue->count) . ")";
---
> $sub_text .= " (". nodequeue_subqueue_size_text($queue->size, $queue->subqueue->count) .")";
Index: nodequeue.actions.inc
===================================================================
RCS file: /cvs/drupal/contributions/modules/nodequeue/Attic/nodequeue.actions.inc,v
retrieving revision 1.1.2.3
diff -r1.1.2.3 nodequeue.actions.inc
13c13
< switch($op) {
---
> switch ($op) {
90c90
< switch($op) {
---
> switch ($op) {