X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=mkdru.admin.inc;h=af8a7ceb7e315754ea6188298ad5dddaf3e6cc88;hb=7f65c61eb4ac230a607fa8125ca41a7e3dc539f8;hp=085c7a54ac62c305fec07912afed90d6f488ad41;hpb=4599df0e52096cca58056571ac88b045527a9eb9;p=mkdru-moved-to-drupal.org.git

diff --git a/mkdru.admin.inc b/mkdru.admin.inc
index 085c7a5..af8a7ce 100644
--- a/mkdru.admin.inc
+++ b/mkdru.admin.inc
@@ -1,57 +1,11 @@
-// $Id$
-
-/**
- * @file
- * Module config.
- */
 <?php
-function mkdru_admin_settings() {
+function mkdru_admin_settings($form, &$form_state) {
   $form['pz2_js_path']=array(
     '#type' => 'textfield',
     '#title' => t('Path to Pazpar2 client library'),
-    '#description' => t('Absolute path to the directory containing pz2.js within the current domain. Do not include leading slash.'),
-    '#default_value' => variable_get('pz2_js_path', 'pazpar2/js'),
+    '#description' => t('Absolute path to the directory containing pz2.js within the current domain.'),
+    '#default_value' => variable_get('pz2_js_path', '/pazpar2/js'),
     '#required' => TRUE
   );
-  $form['search_settings']  = array(
-    '#type' => 'fieldset',
-    '#title' => t('Pazpar2/Service Proxy search settings'),
-    '#collapsible' => TRUE,
-    '#collapsed' => FALSE
-  );
-  $form['search_settings']['pz2_path'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Pazpar2/Service Proxy path'),    
-    '#description' => t('Path that takes Pazpar2 commands via HTTP'),
-    '#required' => TRUE,
-    '#default_value' => variable_get('pz2_path','/pazpar2/search.pz2')
-  );
-  $form['search_settings']['use_sessions'] = array(
-    '#type' => 'checkbox',    '#title' => t('Session handling'),
-    '#description' => t('Disable for use with Service Proxy'),
-    '#default_value' => variable_get('use_sessions', '1')
-  );
-
-  $form['sp_settings']  = array(
-    '#type' => 'fieldset',
-    '#title' => t('Service Proxy specific settings'),
-    '#collapsible' => TRUE,
-    '#collapsed' => FALSE
-  );
-  $form['sp_settings']['sp_user'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Service Proxy username'),
-    '#description' => t('Service Proxy username'),
-    '#required' => FALSE,
-    '#default_value' =>  variable_get('sp_user','')
-  );
-  $form['sp_settings']['sp_pass'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Service Proxy password'),
-    '#description' => t('Service Proxy password'),
-    '#required' => FALSE,
-    '#default_value' => variable_get('sp_pass','')
-  );
-
   return system_settings_form($form);
 }