Index: padfile.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/padfile/Attic/padfile.install,v
retrieving revision 1.1.2.10
diff -u -r1.1.2.10 padfile.install
--- padfile.install	13 Mar 2010 09:02:13 -0000	1.1.2.10
+++ padfile.install	26 Apr 2010 12:57:44 -0000
@@ -355,40 +355,22 @@
   return $schema;
 }
 
-function _padfile_fckeditor_ignore() {
-  if (module_exists('fckeditor')) {
-    $fckeditor = db_query("SELECT settings FROM {fckeditor_settings} WHERE name = '%s'",
-      "FCKeditor Global Profile");
-    $data = db_fetch_object($fckeditor);
-    if ($data) {
-      // FCKeditor is installed and has a global profile
-      //
-      // Verify that the include/exclude setup is as expected
-      $arr = unserialize($data->settings);
-      if ($arr['excl_mode'] == 0) {
-        // Verify that the path isn't already included
-        if (preg_match('|admin/content/padfile/*|', $arr['excl']) == 0) {
-          if (drupal_substr($arr['excl'], -1) != "\n" && drupal_substr($arr['excl'], -1) != "\r") {
-            $arr['excl'] .= "\r\n";
-          }
-          $arr['excl'] .= "admin/content/padfile/*\r\n";
-          db_query("UPDATE {fckeditor_settings} SET settings = '%s' WHERE name = '%s'",
-            serialize($arr), "FCKeditor Global Profile");
-          // Now make sure that the regular expressions are updated
-          module_load_include('admin.inc', 'fckeditor');
-          fckeditor_rebuild_selectors('FCKeditor Global Profile');
-        }
-      }
-    }
-  }
-}
-
 /**
  * Implementation of hook_install().
  */
 function padfile_install() {
-  _padfile_fckeditor_ignore();
-  drupal_install_schema('padfile');
+  // Load the Schema API and its engines.
+  drupal_load('module', 'schema');
+  require_once(drupal_get_path('module', 'schema') . '/engines/schema_mysql.inc');
+  require_once(drupal_get_path('module', 'schema') . '/engines/schema_mysqli.inc');
+  require_once(drupal_get_path('module', 'schema') . '/engines/schema_pgsql.inc');
+
+  // Install the tables.
+  foreach (padfile_schema() as $tablename => $table) {
+    $table['name'] = $tablename;
+    $sql = schema_invoke('create_table_sql', $table);
+    db_query($sql);
+  }
   drupal_set_message('PAD File was installed.');
 }
 
@@ -396,28 +378,10 @@
  * Implementation of hook_uninstall().
  */
 function padfile_uninstall() {
-  drupal_uninstall_schema('padfile');
-  variable_del('padfile_minimum_byte_size');
+  foreach (padfile_schema() as $name => $table) {
+    if (db_table_exists($name)) {
+      db_query('DROP TABLE {' . $name . '}');
+    }
+  }
   drupal_set_message('PAD File was uninstalled.');
 }
-
-/**
- * Implementation of hook_update_#()
- */
-function padfile_update_6000() {
-  $ret = array();
-
-  db_add_field(
-    $ret,
-    'padfile',
-    'link_nodes',
-    array(
-      'type' => 'text',
-      'description' => 'List of nodes where a link to this padfile is shown',
-    )
-  );
-
-  return $ret;
-}
-
-// vim: ts=2 sw=2 et syntax=php
Index: padfile.pages.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/padfile/Attic/padfile.pages.inc,v
retrieving revision 1.1.2.11
diff -u -r1.1.2.11 padfile.pages.inc
--- padfile.pages.inc	13 Mar 2010 08:58:25 -0000	1.1.2.11
+++ padfile.pages.inc	26 Apr 2010 12:57:48 -0000
@@ -6,17 +6,6 @@
  * Implementation of the PAD File output.
  */
 
-
-function _padfile_get_padfiles() {
-  // we want a list of all the active PAD Files
-  $padfiles = array();
-  $result = db_query("SELECT * FROM {padfile} WHERE active = 1 ORDER BY program_name");
-  while ($row = db_fetch_object($result)) {
-    $padfiles[] = $row;
-  }
-  return $padfiles;
-}
-
 function padfile_output($language, $filename, $export = FALSE) {
   global $base_url;
   static $mod_version;
Index: padfile.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/padfile/Attic/padfile.admin.inc,v
retrieving revision 1.1.2.15
diff -u -r1.1.2.15 padfile.admin.inc
--- padfile.admin.inc	5 Apr 2010 00:39:00 -0000	1.1.2.15
+++ padfile.admin.inc	26 Apr 2010 12:57:43 -0000
@@ -7,21 +7,6 @@
  */
 
 /**
- * Retrieve the list of padfiles defined at this site.
- *
- * \return An array composed of the raw rows from the database.
- */
-function _padfile_get_padfiles() {
-  // query with a default order
-  $padfiles = array();
-  $result = db_query("SELECT * FROM {padfile} ORDER BY program_name");
-  while ($row = db_fetch_object($result)) {
-    $padfiles[] = $row;
-  }
-  return $padfiles;
-}
-
-/**
  * Retrieve the list of descriptions for the specified PAD File.
  *
  * \return An array composed of the raw rows from the database.
@@ -448,7 +433,7 @@
 /**
  * Menu callback (add a PAD file to the site)
  */
-function padfile_form_padfile(&$form_state, $edit = array()) {
+function padfile_form_padfile($form_state = NULL, $edit = array()) {
   global $user;
 
   // make sure we have proper defaults
@@ -1323,7 +1308,7 @@
 /**
  * Menu callback (Offer a way to the user to import his PAD Files)
  */
-function padfile_form_import(&$form_state) {
+function padfile_form_import($form_state = array()) {
   // make sure we are sent the proper type of data
   $form['#attributes'] = array(
     'enctype' => "multipart/form-data"
Index: padfile.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/padfile/Attic/padfile.info,v
retrieving revision 1.1.2.5
diff -u -r1.1.2.5 padfile.info
--- padfile.info	13 Mar 2010 08:58:25 -0000	1.1.2.5
+++ padfile.info	26 Apr 2010 12:57:43 -0000
@@ -2,14 +2,5 @@
 name = "PAD File"
 package = "PAD File"
 description = "Portable Application Description support"
-core = 6.x
-
-
-
-
-; Information added by drupal.org packaging script on 2010-03-01
-version = "6.x-1.x-dev"
-core = "6.x"
-project = "padfile"
-datestamp = "1267402298"
-
+core = 5.x
+dependencies = schema
Index: padfile.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/padfile/Attic/padfile.module,v
retrieving revision 1.1.2.11
diff -u -r1.1.2.11 padfile.module
--- padfile.module	15 Apr 2010 03:25:41 -0000	1.1.2.11
+++ padfile.module	26 Apr 2010 12:57:47 -0000
@@ -27,47 +27,57 @@
 /**
  * Implementation of hook_menu().
  */
-function padfile_menu() {
-  $items = array();
+function padfile_menu($may_cache) {
+  // All the menu items may be cached, but the include files must be present.
+  if (!$may_cache) {
+    require_once('padfile.admin.inc');
+    require_once('padfile.pages.inc');
+    return array();
+  }
+
   $items['admin/content/padfile'] = array(
+    'path' => 'admin/content/padfile',
     'title' => 'PAD Files',
     'description' => 'Configure your XML PAD files.',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('padfile_content_list'),
-    'access arguments' => array('administer padfile'),
+    'callback' => 'drupal_get_form',
+    'callback arguments' => array('padfile_content_list'),
+    'access' => user_access('administer padfile'),
     'file' => 'padfile.admin.inc',
   );
   $items['admin/content/padfile/list'] = array(
+    'path' => 'admin/content/padfile/list',
     'title' => 'List',
     'description' => 'Select the PAD File to edit.',
     'weight' => 0,
     'type' => MENU_DEFAULT_LOCAL_TASK,
   );
   $items['admin/content/padfile/add'] = array(
+    'path' => 'admin/content/padfile/add',
     'title' => 'Add',
     'description' => 'Create a new PAD File for this website.',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('padfile_form_padfile'),
-    'access arguments' => array('create padfile'),
+    'callback' => 'drupal_get_form',
+    'callback arguments' => array('padfile_form_padfile'),
+    'access' => user_access('create padfile'),
     'weight' => 1,
     'type' => MENU_LOCAL_TASK,
     'file' => 'padfile.admin.inc',
   );
   $items['admin/content/padfile/import'] = array(
+    'path' => 'admin/content/padfile/import',
     'title' => 'Import',
     'description' => 'Import an existing XML PAD File.',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('padfile_form_import'),
-    'access arguments' => array('create padfile'),
+    'callback' => 'drupal_get_form',
+    'callback arguments' => array('padfile_form_import'),
+    'access' => user_access('create padfile'),
     'weight' => 2,
     'type' => MENU_LOCAL_TASK,
     'file' => 'padfile.admin.inc',
   );
   $items['admin/content/padfile/edit/%padfile_padfile'] = array(
     'title' => 'Edit',
-    'page callback' => 'padfile_content_edit',
-    'page arguments' => array(4),
-    'access arguments' => array('edit own padfile'),
+    'callback' => 'padfile_content_edit',
+    'callback arguments' => array(4),
+    'access' => user_access('edit own padfile'),
     'type' => MENU_CALLBACK,
     'file' => 'padfile.admin.inc',
   );
@@ -79,51 +89,51 @@
   );
   $items['admin/content/padfile/edit/%padfile_padfile/desc_list'] = array(
     'title' => 'List descriptions',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('padfile_content_description_list', 4),
-    'access arguments' => array('edit own padfile'),
+    'callback' => 'drupal_get_form',
+    'callback arguments' => array('padfile_content_description_list', 4),
+    'access' => user_access('edit own padfile'),
     'type' => MENU_LOCAL_TASK,
     'file' => 'padfile.admin.inc',
   );
   $items['admin/content/padfile/edit/%/desc_add'] = array(
     'title' => 'Add description',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('padfile_form_description', 4),
-    'access arguments' => array('create padfile'),
+    'callback' => 'drupal_get_form',
+    'callback arguments' => array('padfile_form_description', 4),
+    'access' => user_access('create padfile'),
     'type' => MENU_LOCAL_TASK,
     'file' => 'padfile.admin.inc',
     'weight' => 10,
   );
   $items['admin/content/padfile/edit/%/desc_edit/%'] = array(
     'title' => 'Edit description',
-    'page callback' => 'padfile_content_description_edit',
-    'page arguments' => array(4, 6),
-    'access arguments' => array('edit own padfile'),
+    'callback' => 'padfile_content_description_edit',
+    'callback arguments' => array(4, 6),
+    'access' => user_access('edit own padfile'),
     'type' => MENU_CALLBACK,
     'file' => 'padfile.admin.inc',
   );
   $items['admin/content/padfile/edit/%/desc_delete/%'] = array(
     'title' => 'Delete description',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('padfile_confirm_description_delete', 4, 6),
-    'access arguments' => array('delete own padfile'),
+    'callback' => 'drupal_get_form',
+    'callback arguments' => array('padfile_confirm_description_delete', 4, 6),
+    'access' => user_access('delete own padfile'),
     'type' => MENU_CALLBACK,
     'file' => 'padfile.admin.inc',
   );
   $items['admin/content/padfile/delete/%padfile_padfile'] = array(
     'title' => 'Delete a PAD File',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('padfile_confirm_delete', 4),
-    'access arguments' => array('delete own padfile'),
+    'callback' => 'drupal_get_form',
+    'callback arguments' => array('padfile_confirm_delete', 4),
+    'access' => user_access('delete own padfile'),
     'type' => MENU_CALLBACK,
     'file' => 'padfile.admin.inc',
   );
   $items['admin/content/padfile/settings'] = array(
     'title' => 'Settings',
     'description' => 'Global settings for the PAD File system.',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('padfile_form_settings'),
-    'access arguments' => array('administer padfile'),
+    'callback' => 'drupal_get_form',
+    'callback arguments' => array('padfile_form_settings'),
+    'access' => user_access('administer padfile'),
     'weight' => 10,
     'type' => MENU_LOCAL_TASK,
     'file' => 'padfile.admin.inc',
@@ -131,34 +141,34 @@
   $items['admin/content/padfile/tools'] = array(
     'title' => 'Tools',
     'description' => 'Functions to apply to all your PAD Files and Cache functions.',
-    'page callback' => 'drupal_get_form',
-    'page arguments' => array('padfile_form_tools'),
-    'access arguments' => array('administer padfile'),
+    'callback' => 'drupal_get_form',
+    'callback arguments' => array('padfile_form_tools'),
+    'access' => user_access('administer padfile'),
     'weight' => 20,
     'type' => MENU_LOCAL_TASK,
     'file' => 'padfile.admin.inc',
   );
   $items['padfile/%'] = array( // filename only
     'title' => 'PAD File retrieval',
-    'page callback' => 'padfile_output',
-    'page arguments' => array('all', 1, FALSE),
-    'access arguments' => array('access padfile'),
+    'callback' => 'padfile_output',
+    'callback arguments' => array('all', 1, FALSE),
+    'access' => user_access('access padfile'),
     'type' => MENU_CALLBACK,
     'file' => 'padfile.pages.inc',
   );
   $items['padfile/%/%'] = array( // language + filename, ignore all other descriptions
     'title' => 'PAD File retrieval, language specific',
-    'page callback' => 'padfile_output',
-    'page arguments' => array(1, 2, FALSE),
-    'access arguments' => array('access padfile'),
+    'callback' => 'padfile_output',
+    'callback arguments' => array(1, 2, FALSE),
+    'access' => user_access('access padfile'),
     'type' => MENU_CALLBACK,
     'file' => 'padfile.pages.inc',
   );
   $items['padfile/%/%/%'] = array( // export + language + filename, ignore all other descriptions
     'title' => 'Exporting PAD File retrieval (type changed)',
-    'page callback' => 'padfile_output',
-    'page arguments' => array(2, 3, TRUE),
-    'access arguments' => array('access padfile'),
+    'callback' => 'padfile_output',
+    'callback arguments' => array(2, 3, TRUE),
+    'access' => user_access('access padfile'),
     'type' => MENU_CALLBACK,
     'file' => 'padfile.pages.inc',
   );
@@ -167,7 +177,7 @@
 
 /**
  * Implementation of hook_link()
- */
+ *
 function padfile_link($type, $node = NULL, $teaser = FALSE) {
   if ($teaser) {
     return;
@@ -194,20 +204,6 @@
 }
 
 /**
- * Implementation of hook_theme()
- */
-function padfile_theme() {
-  return array(
-    'padfile_content_list' => array(
-      'arguments' => array('form' => array()),
-    ),
-    'padfile_content_description_list' => array(
-      'arguments' => array('form' => array()),
-    ),
-  );
-}
-
-/**
  * Implementation of hook_load()
  *
  * Retrieve a PAD File
@@ -261,3 +257,17 @@
   db_query("DELETE FROM {padfile_descriptions} WHERE padid = %d AND language = '%s'", $padid, $language);
 }
 
+/**
+ * Retrieve the list of padfiles defined at this site.
+ *
+ * \return An array composed of the raw rows from the database.
+ */
+function _padfile_get_padfiles() {
+  // query with a default order
+  $padfiles = array();
+  $result = db_query("SELECT * FROM {padfile} ORDER BY program_name");
+  while ($row = db_fetch_object($result)) {
+    $padfiles[] = $row;
+  }
+  return $padfiles;
+}
Index: padfile_filter/padfile_filter.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/padfile/padfile_filter/Attic/padfile_filter.info,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 padfile_filter.info
--- padfile_filter/padfile_filter.info	13 Mar 2010 08:58:25 -0000	1.1.2.2
+++ padfile_filter/padfile_filter.info	26 Apr 2010 12:57:48 -0000
@@ -2,15 +2,5 @@
 name = "PAD File Filter"
 package = "PAD File"
 description = "Filter to display a link or add content to a node from the definition of a Portable Application Description support"
-dependencies[] = padfile
+dependencies = drupal6 padfile
 core = 6.x
-
-
-
-
-; Information added by drupal.org packaging script on 2010-03-01
-version = "6.x-1.x-dev"
-core = "6.x"
-project = "padfile"
-datestamp = "1267402298"
-
Index: padfile_page/padfile_page.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/padfile/padfile_page/Attic/padfile_page.info,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 padfile_page.info
--- padfile_page/padfile_page.info	13 Mar 2010 08:58:25 -0000	1.1.2.2
+++ padfile_page/padfile_page.info	26 Apr 2010 12:57:48 -0000
@@ -2,15 +2,5 @@
 name = "PAD File Page"
 package = "PAD File"
 description = "Display one page per PAD File"
-dependencies[] = padfile
+dependencies = drupal6 padfile
 core = 6.x
-
-
-
-
-; Information added by drupal.org packaging script on 2010-03-01
-version = "6.x-1.x-dev"
-core = "6.x"
-project = "padfile"
-datestamp = "1267402298"
-
Index: padfile_views/padfile_views.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/padfile/padfile_views/Attic/padfile_views.info,v
retrieving revision 1.1.2.3
diff -u -r1.1.2.3 padfile_views.info
--- padfile_views/padfile_views.info	13 Mar 2010 08:58:25 -0000	1.1.2.3
+++ padfile_views/padfile_views.info	26 Apr 2010 12:57:48 -0000
@@ -2,16 +2,5 @@
 name = "PAD File Views Support"
 package = "PAD File"
 description = "Portable Application Description support for Views"
-dependencies[] = padfile
-dependencies[] = views
+dependencies = drupal6 padfile
 core = 6.x
-
-
-
-
-; Information added by drupal.org packaging script on 2010-03-01
-version = "6.x-1.x-dev"
-core = "6.x"
-project = "padfile"
-datestamp = "1267402298"
-