diff --git a/sites/all/modules/unl/unl.module b/sites/all/modules/unl/unl.module index 26cee51194082e9f94ccacda3e0cc3365abd31d2..50f8ead87f9f4ec0b6fdec3521349ad0298bf864 100644 --- a/sites/all/modules/unl/unl.module +++ b/sites/all/modules/unl/unl.module @@ -85,7 +85,8 @@ function unl_menu() 'title' => 'UNL Migration Tool', 'description' => 'Migrate a static UNL template page into drupal', 'access arguments' => array('unl migration'), - 'page callback' => 'unl_migration_page', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('unl_migration'), 'type' => MENU_LOCAL_TASK, 'file' => 'unl_migration.php' ); @@ -94,7 +95,8 @@ function unl_menu() 'title' => 'UNL Site Creation Tool', 'description' => 'Create a new UNL Drupal site', 'access arguments' => array('unl site creation'), - 'page callback' => 'unl_site_creation_page', + 'page callback' => 'drupal_get_form', + 'page arguments' => array('unl_site_creation'), 'type' => MENU_LOCAL_TASK, 'file' => 'unl_site_creation.php' ); diff --git a/sites/all/modules/unl/unl_migration.php b/sites/all/modules/unl/unl_migration.php index 61798278689447fa93bd77f0be8853b4a9f7098a..9b42bd247a33d4934390d15b06c6595b852c82bc 100644 --- a/sites/all/modules/unl/unl_migration.php +++ b/sites/all/modules/unl/unl_migration.php @@ -1,11 +1,5 @@ <?php -function unl_migration_page() -{ - return drupal_get_form('unl_migration'); -} - - function unl_migration($form, &$form_state) { $form['root'] = array( @@ -157,9 +151,6 @@ class Unl_Migration_Tool } $this->_createMenu(); - - print_r($this->_log); - exit; } private function _addSitePath($path) @@ -668,6 +659,7 @@ class Unl_Migration_Tool private function _log($message) { $this->_log[] = $message; + drupal_set_message($message, 'status'); } } diff --git a/sites/all/modules/unl/unl_site_creation.php b/sites/all/modules/unl/unl_site_creation.php index 0d61a54012fb82ed769f28ff6886b920e4755d43..2a779ffc5b4802d019f8a5909e284d32fc1fff21 100644 --- a/sites/all/modules/unl/unl_site_creation.php +++ b/sites/all/modules/unl/unl_site_creation.php @@ -2,12 +2,6 @@ require_once DRUPAL_ROOT . '/includes/install.core.inc'; -function unl_site_creation_page() -{ - return drupal_get_form('unl_site_creation'); -} - - function unl_site_creation($form, &$form_state) { $form['root'] = array(