Index: qr_codes.block.inc
===================================================================
RCS file: qr_codes.block.inc
diff -N qr_codes.block.inc
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ qr_codes.block.inc	26 Oct 2010 20:49:18 -0000
@@ -0,0 +1,81 @@
+<?php
+/**
+ * callback for block configure form
+ */
+function _qr_codes_block_configure_form($delta = 0, $edit = array()) {
+  $form = array();
+  $form['qr_codes'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('QR Codes Node Block'),
+    '#collapsible' => FALSE,
+  );
+  
+  $form['qr_codes']['qr_codes_block_data'] = array(
+    '#type' => 'textarea',
+    '#title' => t('Enter the text to embed in your barcode'),
+    '#description' => t('Available token replacement patterns are listed below and will be applied on node or user pages.'),
+    '#default_value' => variable_get('qr_codes_block_data', '')
+  );
+  
+  if (module_exists('token')) {
+    $form['qr_codes']['tokens'] = array(
+      '#type' => 'fieldset',
+      '#title' => t('Available Tokens'),
+      '#collapsible' => TRUE,
+      '#collapsed' => TRUE,
+    );
+    
+    $form['qr_codes']['tokens']['help'] = array(
+      '#value' => theme('token_help', 'node'),
+    );
+  }
+  
+  if(function_exists('imagecache_presets')){
+    $options = array('');
+    foreach((array)imagecache_presets() as $preset){
+      $options[$preset['presetname']] = $preset['presetname'];
+    }
+    
+    $form['qr_codes']['qr_codes_block_imagecache_preset'] = array(
+      '#type' => 'select',
+      '#title' => t('Select an Imagecache preset'),
+      '#multiple' => FALSE,
+      '#description' => t('If selected, this imagecache preset will be applied to the barcode image.'),
+      '#options' => $options,
+      '#default_value' => variable_get('qr_codes_block_imagecache_preset', -1),
+    );
+  }
+  return $form;
+}
+
+/**
+ * callback to handle save of block configure options
+ */
+function _qr_codes_block_configure_save($delta, $edit) {
+  variable_set('qr_codes_block_data', $edit['qr_codes_block_data']);
+  if (!empty($edit['qr_codes_block_imagecache_preset'])) {
+    variable_set('qr_codes_block_imagecache_preset', $edit['qr_codes_block_imagecache_preset']);
+  }
+}
+
+/**
+ * callback to handle view of qr_codes block
+ */
+function _qr_codes_block_view($delta, $edit) {
+  $block['subject'] = t('QR Codes');
+
+  $data = variable_get('qr_codes_block_data', '');
+  
+  // use token replacement if available for nodes and users
+  $tokens = module_exists('token');
+  global $user;
+  if (arg(0) == 'node' && is_numeric(arg(1)) && $tokens) {
+    $data = token_replace($data, 'node', node_load(arg(1)));
+  }
+  if ($tokens && $user->uid) {
+    $data = token_replace($data, 'user', $user);
+  }
+  
+  $block['content'] = theme('qr_codes', $data, 150, 150, 0, variable_get('qr_codes_block_imagecache_preset', ''));
+  return $block;
+}
\ No newline at end of file
Index: qr_codes.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/qr_codes/qr_codes.module,v
retrieving revision 1.2.2.4
diff -u -p -r1.2.2.4 qr_codes.module
--- qr_codes.module	26 Oct 2010 19:29:09 -0000	1.2.2.4
+++ qr_codes.module	26 Oct 2010 20:49:18 -0000
@@ -142,82 +142,22 @@ function qr_codes_block($op = 'list', $d
     case 'list':
       $blocks[0]['info'] = t('QR Codes block');
       return $blocks;
-
     case 'configure':
       if ($delta == 0) {
-        $form['qr_codes'] = array(
-          '#type' => 'fieldset',
-          '#title' => t('QR Codes Node Block'),
-          '#collapsible' => FALSE,
-        );
-
-        $form['qr_codes']['qr_codes_block_data'] = array(
-          '#type' => 'textarea',
-          '#title' => t('Enter the text to embed in your barcode'),
-          '#description' => t('Available token replacement patterns are listed below and will be applied on node or user pages.'),
-          '#default_value' => variable_get('qr_codes_block_data', '')
-        );
-
-        if (module_exists('token')) {
-          $form['qr_codes']['tokens'] = array(
-            '#type' => 'fieldset',
-            '#title' => t('Available Tokens'),
-            '#collapsible' => TRUE,
-            '#collapsed' => TRUE,
-          );
-
-          $form['qr_codes']['tokens']['help'] = array(
-            '#value' => theme('token_help', 'node'),
-          );
-        }
-
-        if(function_exists('imagecache_presets')){
-          $options = array('');
-          foreach((array)imagecache_presets() as $preset){
-            $options[$preset['presetname']] = $preset['presetname'];
-          }
-
-          $form['qr_codes']['qr_codes_block_imagecache_preset'] = array(
-            '#type' => 'select',
-            '#title' => t('Select an Imagecache preset'),
-            '#multiple' => FALSE,
-            '#description' => t('If selected, this imagecache preset will be applied to the barcode image.'),
-            '#options' => $options,
-            '#default_value' => variable_get('qr_codes_block_imagecache_preset', -1),
-          );
-
-        }
+        module_load_include('inc', 'qr_codes', 'qr_codes.block');
+        return _qr_codes_block_configure_form($delta, $edit);
       }
-      return $form;
-
     case 'save':
       if ($delta == 0) {
-        variable_set('qr_codes_block_data', $edit['qr_codes_block_data']);
-        if (!empty($edit['qr_codes_block_imagecache_preset'])) {
-          variable_set('qr_codes_block_imagecache_preset', $edit['qr_codes_block_imagecache_preset']);
-        }
+        module_load_include('inc', 'qr_codes', 'qr_codes.block');
+        _qr_codes_block_configure_save($delta, $edit);
       }
       break;
-
     case 'view':
       if ($delta == 0) {
-        $block['subject'] = t('QR Codes');
-
-        $data = variable_get('qr_codes_block_data', '');
-
-        // use token replacement if available for nodes and users
-        $tokens = module_exists('token');
-        global $user;
-        if (arg(0) == 'node' && is_numeric(arg(1)) && $tokens) {
-          $data = token_replace($data, 'node', node_load(arg(1)));
-        }
-        if($tokens && $user->uid) {
-          $data = token_replace($data, 'user', $user);
-        }
-
-        $block['content'] = theme('qr_codes', $data, 150, 150, 0, variable_get('qr_codes_block_imagecache_preset', ''));
+        module_load_include('inc', 'qr_codes', 'qr_codes.block');
+        return _qr_codes_block_view($delta, $edit);
       }
-
-      return $block;
+      break;
   }
 }