/[drupal]/contributions/modules/nodequeue/nodequeue.module
ViewVC logotype

Diff of /contributions/modules/nodequeue/nodequeue.module

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.93, Tue Sep 29 16:25:08 2009 UTC revision 1.94, Sat Oct 3 20:32:12 2009 UTC
# Line 1  Line 1 
1  <?php  <?php
2  // $Id: nodequeue.module,v 1.92 2009/08/27 20:44:27 ezrag Exp $  // $Id: nodequeue.module,v 1.93 2009/09/29 16:25:08 ezrag Exp $
3    
4  /**  /**
5   * @file   * @file
# Line 1121  function nodequeue_arrange_subqueue_form Line 1121  function nodequeue_arrange_subqueue_form
1121      '#value' => t('Clear'),      '#value' => t('Clear'),
1122      '#submit' => array('nodequeue_arrange_subqueue_form_clear_submit'),      '#submit' => array('nodequeue_arrange_subqueue_form_clear_submit'),
1123    );    );
1124      $form['#validate'][] = 'nodequeue_arrange_subqueue_form_add_validate';
1125    // disable all buttons if the queue is empty    // disable all buttons if the queue is empty
1126    if ($count == 0) {    if ($count == 0) {
1127      $form['submit']['#disabled']  = TRUE;      $form['submit']['#disabled']  = TRUE;
# Line 1279  function nodequeue_arrange_subqueue_form Line 1279  function nodequeue_arrange_subqueue_form
1279  function nodequeue_arrange_subqueue_form_add_submit($form, &$form_state) {  function nodequeue_arrange_subqueue_form_add_submit($form, &$form_state) {
1280    $queue = nodequeue_load($form['#queue']['qid']);    $queue = nodequeue_load($form['#queue']['qid']);
1281    $subqueue = nodequeue_load_subqueue($form['#subqueue']['sqid']);    $subqueue = nodequeue_load_subqueue($form['#subqueue']['sqid']);
   
1282    if (!empty($form_state['values']['add']['nid'])) {    if (!empty($form_state['values']['add']['nid'])) {
1283      preg_match('/\[nid: (\d+)\]$/', $form_state['values']['add']['nid'], $matches);      preg_match('/\[nid: (\d+)\]$/', $form_state['values']['add']['nid'], $matches);
1284      $nid = $matches[1];      $nid = $matches[1];
1285        if (empty($nid)) {
1286          form_set_error('', t('Please enter a valid node title.'));
1287        }
1288    }    }
1289    
1290    nodequeue_subqueue_add($queue, $subqueue, $nid);    nodequeue_subqueue_add($queue, $subqueue, $nid);
# Line 1995  function nodequeue_remove_subqueue($sqid Line 1997  function nodequeue_remove_subqueue($sqid
1997   *   The node ID   *   The node ID
1998   */   */
1999  function nodequeue_subqueue_add($queue, &$subqueue, $nid) {  function nodequeue_subqueue_add($queue, &$subqueue, $nid) {
2000    // If adding this would make the queue too big, pop the front node    if (!empty($nid)) {
2001    // (or nodes) out.      db_query("INSERT INTO {nodequeue_nodes} (sqid, qid, nid, position, timestamp) VALUES (%d, %d, %d, %d, %d)", $subqueue->sqid, $queue->qid, $nid, $subqueue->count + 1, time());
2002        $subqueue->count++;
2003    if (!empty($queue->size)) {      // If adding this would make the queue too big, pop the front node
2004      // 0 means infinity so never do this if false      // (or nodes) out.
2005      nodequeue_check_subqueue_size($queue, $subqueue, $queue->size - 1);      if (!empty($queue->size)) {
2006    }        // 0 means infinity so never do this if false
2007          nodequeue_check_subqueue_size($queue, $subqueue, $queue->size - 1);
2008    db_query("INSERT INTO {nodequeue_nodes} (sqid, qid, nid, position, timestamp) VALUES (%d, %d, %d, %d, %d)", $subqueue->sqid, $queue->qid, $nid, $subqueue->count + 1, time());      }
2009    $subqueue->count++;      if (module_exists('apachesolr')) {
2010    if (module_exists('apachesolr')) {        apachesolr_mark_node($nid);
2011      apachesolr_mark_node($nid);      }
2012        //Invoke the hook to notify other modules of the node addition.
2013        module_invoke_all('nodequeue_add', $subqueue->sqid, $nid);
2014    }    }
   
   // Invoke the hook to notify other modules of the node addition.  
   module_invoke_all('nodequeue_add', $subqueue->sqid, $nid);  
2015  }  }
2016    
2017  /**  /**
Legend:
Removed from v.1.93  
changed lines
  Added in v.1.94
  ViewVC Help
Powered by ViewVC 1.1.2