Index: flickrapi.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/flickrapi/flickrapi.info,v
retrieving revision 1.1
diff -u -r1.1 flickrapi.info
--- flickrapi.info	13 Sep 2008 23:58:11 -0000	1.1
+++ flickrapi.info	17 Oct 2008 17:38:20 -0000
@@ -1,4 +1,5 @@
 ; $Id: 
 name = FlickrAPI
 description = Use Flickr APIs with Drupal using phpFlickr
-package = Flickr
\ No newline at end of file
+package = Flickr
+core = 6.x
\ No newline at end of file
Index: flickrapi.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/flickrapi/flickrapi.module,v
retrieving revision 1.1
diff -u -r1.1 flickrapi.module
--- flickrapi.module	13 Sep 2008 23:58:11 -0000	1.1
+++ flickrapi.module	17 Oct 2008 20:55:17 -0000
@@ -4,27 +4,34 @@
 /**
 * Implementation of hook_menu
 */
-function flickrapi_menu($cache) {
+function flickrapi_menu() {
   $items = array();
-  if ($cache) {
-    $items[] = array(
-			'title' => t('Flickr API Settings'),
-			'path' => 'admin/settings/flickrapi',
-			'description' => t('Configure Flickr API credentials.'),
-			'access' => user_access('administer site configuration'),
-			'type' => MENU_NORMAL_ITEM,
-			'callback' => 'drupal_get_form',
-			'callback arguments' => array('flickrapi_admin_settings')
-    );
-  }
+  $items['admin/settings/flickrapi'] = array(
+    'title' => 'Flickr API Settings',
+    'title arguments' => array(),
+    'title callback' => 't',
+    'description' => 'Configure Flickr API credentials.',
+    'access arguments' => array('administer site configuration'),
+    'type' => MENU_NORMAL_ITEM,
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('flickrapi_admin_settings')
+  );
   return $items;
 }
 
+function flickrapi_theme($existing, $type, $theme, $path) {
+  return array(
+    'flickrapi_admin_settings' => 
+      array( 'arguments' => array('form'=>NULL) )
+  );
+}
+
 /**
  * Implementation of hook_settings
  */
 function flickrapi_admin_settings() {
-  $form['#validate'] = array('flickrapi_admin_settings_validate' => array());
+  $form = array();
+	
   $form['flickrapi_api_key'] = array(
     '#type' => 'textfield',
     '#title' => t('API Key'),
@@ -48,13 +55,17 @@
     '#default_value' => variable_get('flickrapi_cache_duration', 3600),
     '#description' => t("The refresh interval indicating how often you want to check cached Flickr API calls are up to date."),
   );
-	
+  
+	$form['#validate'][] = 'flickrapi_admin_settings_validate';
+  $form['#submit'][] = 'flickrapi_admin_settings_submit';
+  $form['#theme'] = 'flickrapi_admin_settings';
+  
   return system_settings_form($form);
 }
 
-function flickrapi_admin_settings_validate($form_id, $form) {
-  $key = trim($form['flickrapi_api_key']);
-  $sec = trim($form['flickrapi_api_secret']);
+function flickrapi_admin_settings_validate($form, &$form_state) {
+  $key = trim($form_state['values']['flickrapi_api_key']);
+  $sec = trim($form_state['values']['flickrapi_api_secret']);
 	
   if ($key && (preg_match('/^[A-Fa-f\d]{32}$/', $key) != 1)) {
     form_set_error('flickrapi_api_key', t('This does not appear to be a Flickr API key.'));
@@ -64,13 +75,13 @@
   }
 }
 
-function flickrapi_admin_settings_submit($form_id, $form) {
+function flickrapi_admin_settings_submit($form, &$form_state) {
   // clean up the data ...
-  $form['flickrapi_api_key'] = trim($form['flickrapi_api_key']);
-  $form['flickrapi_api_secret'] = trim($form['flickrapi_api_secret']);
+  $form_state['values']['flickrapi_api_key'] = trim($form_state['values']['flickrapi_api_key']);
+  $form_state['values']['flickrapi_api_secret'] = trim($form_state['values']['flickrapi_api_secret']);
 	
   // ... and save the settings
-  system_settings_form_submit($form_id, $form);
+  system_settings_form_submit($form, $form_state);
 }
 
 /**
@@ -79,12 +90,8 @@
  * then it'll all be done here.
  */
 function flickrapi_phpFlickr() {
-  $include_file = drupal_get_path('module', 'flickrapi') .'/phpFlickr/phpFlickr.php';
-  if (!file_exists($include_file)) {
-    drupal_set_message(t("Missing phpFlickr - expected to find it at !file", array('!file' => $include_file)));
-    return false;
-  }
-  require_once($include_file);
+  module_load_include('php', 'flickrapi', 'phpFlickr/phpFlickr');
+  
   $api_key = variable_get('flickrapi_api_key', '');
   if (!$api_key) {
     drupal_set_message(t("Flickr API key not set"), 'error');