Index: cck-redirection-frameset-header.tpl.php =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/cck_redirection/Attic/cck-redirection-frameset-header.tpl.php,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 cck-redirection-frameset-header.tpl.php --- cck-redirection-frameset-header.tpl.php 9 Jul 2008 05:01:49 -0000 1.1.2.1 +++ cck-redirection-frameset-header.tpl.php 24 Jun 2009 15:53:03 -0000 @@ -1,5 +1,5 @@ Index: cck-redirection-frameset.tpl.php =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/cck_redirection/Attic/cck-redirection-frameset.tpl.php,v retrieving revision 1.1.2.1 diff -u -p -r1.1.2.1 cck-redirection-frameset.tpl.php --- cck-redirection-frameset.tpl.php 9 Jul 2008 05:01:49 -0000 1.1.2.1 +++ cck-redirection-frameset.tpl.php 24 Jun 2009 15:53:03 -0000 @@ -1,5 +1,5 @@ Index: cck_redirection.info =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/cck_redirection/cck_redirection.info,v retrieving revision 1.1.4.1 diff -u -p -r1.1.4.1 cck_redirection.info --- cck_redirection.info 9 Jul 2008 04:52:19 -0000 1.1.4.1 +++ cck_redirection.info 24 Jun 2009 15:53:03 -0000 @@ -1,6 +1,6 @@ -; $Id: cck_redirection.info,v 1.1.4.1 2008/07/09 04:52:19 morrissinger Exp $ -name = CCK Redirection -core = 6.x -description = Provides a CCK field and widget for providing a URL to which to redirect the user. -package = CCK +; $Id$ +name = CCK Redirection +core = 6.x +description = Provides a CCK field and widget for providing a URL to which to redirect the user. +package = CCK dependencies[] = content \ No newline at end of file Index: cck_redirection.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/cck_redirection/cck_redirection.module,v retrieving revision 1.1.4.2 diff -u -p -r1.1.4.2 cck_redirection.module --- cck_redirection.module 31 Oct 2008 21:51:55 -0000 1.1.4.2 +++ cck_redirection.module 24 Jun 2009 15:53:03 -0000 @@ -1,5 +1,5 @@ array( - 'arguments' => array('element' => NULL), + return array( + 'cck_redirection' => array( + 'arguments' => array('element' => NULL), ), 'cck_redirection_frameset' => array( // Show the new page in the bottom half of a frameset (think Google Images) 'template' => 'cck-redirection-frameset', @@ -125,15 +125,15 @@ function cck_redirection_form_alter(&$fo /** * Implementation of FAPI hook_elements(). */ -function cck_redirection_elements() { - return array( - 'cck_redirection' => array( - '#input' => TRUE, +function cck_redirection_elements() { + return array( + 'cck_redirection' => array( + '#input' => TRUE, '#columns' => array('value'), - '#delta' => 0, - '#process' => array('cck_redirection_process'), - '#autocomplete_path' => FALSE, - ), + '#delta' => 0, + '#process' => array('cck_redirection_process'), + '#autocomplete_path' => FALSE, + ), ); } @@ -390,22 +390,22 @@ function cck_redirection_frameset_header * * The $fields array is in $form['#field_info'][$element['#field_name']]. */ -function cck_redirection_process($element, $edit, $form_state, $form) { - $field = $form['#field_info'][$element['#field_name']]; +function cck_redirection_process($element, $edit, $form_state, $form) { + $field = $form['#field_info'][$element['#field_name']]; $field_key = $element['#columns'][0]; - $delta = $element['#delta']; + $delta = $element['#delta']; $element[$field_key] = array( - '#type' => 'textfield', + '#type' => 'textfield', '#title' => $element['#title'], '#description' => $element['#description'], - '#required' => $element['#required'], + '#required' => $element['#required'], '#default_value' => isset($element['#value']) ? $element['#value'] : NULL, '#autocomplete_path' => $element['#autocomplete_path'], ); - + if (!empty($field['max_length'])) { - $element[$field_key]['#maxlength'] = $field['max_length']; - } + $element[$field_key]['#maxlength'] = $field['max_length']; + } if (!empty($field['text_processing'])) { $filter_key = $element['#columns'][1]; $format = isset($element['#value'][$filter_key]) ? $element['#value'][$filter_key] : FILTER_FORMAT_DEFAULT; @@ -566,9 +566,9 @@ function _cck_redirection_redirect(&$ele $method = is_numeric($widget['redirect_type']) ? $widget['redirect_type'] : NULL; if (user_access('bypass redirection')) { - if (!empty($element['#item']['value'])) { - drupal_set_message(t('This node is redirected to a !r.', array('!r' => l(t('remote URI'), $element['#item']['value'])))); - } + if (!empty($element['#item']['value'])) { + drupal_set_message(t('This node is redirected to a !r.', array('!r' => l(t('remote URI'), $element['#item']['value'])))); + } } else { switch ($widget['redirect_type']) { case CCK_REDIRECTION_DIVERT: @@ -594,27 +594,27 @@ function _cck_redirection_redirect(&$ele * Diverts the browser to the target URI page. */ function _cck_redirection_divert($element) { - if (!empty($element['#item']['value'])) { - drupal_goto($element['#item']['value']); - } + if (!empty($element['#item']['value'])) { + drupal_goto($element['#item']['value']); + } } /** * Uses JS to delay redirection by five seconds, and then diverts the browser to the target URI page. */ -function _cck_redirection_delay($element) { - if (!empty($element['#item']['value'])) { - $_SESSION['cck_redirection'] = $element; - drupal_add_js('cck_redirection/js'); - } -} - +function _cck_redirection_delay($element) { + if (!empty($element['#item']['value'])) { + $_SESSION['cck_redirection'] = $element; + drupal_add_js('cck_redirection/js'); + } +} + /** * Displays the target URI inside of a frameset. */ function _cck_redirection_frameset($element) { - if (!empty($element['#item']['value'])) { - $_SESSION['cck_redirection'] = $element; - drupal_goto('redirect', 'uri=' . drupal_urlencode($element['#item']['value'])); - } -} + if (!empty($element['#item']['value'])) { + $_SESSION['cck_redirection'] = $element; + drupal_goto('redirect', 'uri=' . drupal_urlencode($element['#item']['value'])); + } +}