cvs diff: Diffing .
Index: xmlsitemap.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/gsitemap/xmlsitemap.info,v
retrieving revision 1.3
diff -u -r1.3 xmlsitemap.info
--- xmlsitemap.info     18 Jun 2007 22:53:44 -0000      1.3
+++ xmlsitemap.info     16 Aug 2007 19:26:00 -0000
@@ -1,4 +1,4 @@
 ; $Id: xmlsitemap.info,v 1.3 2007/06/18 22:53:44 dww Exp $
 name = XML Sitemap
 description = Creates an XML site map in accordance with the sitemaps.org specification.
-
+core = 6.x
Index: xmlsitemap.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/gsitemap/xmlsitemap.module,v
retrieving revision 1.20
diff -u -r1.20 xmlsitemap.module
--- xmlsitemap.module   28 Jun 2007 03:03:09 -0000      1.20
+++ xmlsitemap.module   16 Aug 2007 19:26:01 -0000
@@ -9,8 +9,8 @@
 /**
  * Implementation of hook_help().
  */
-function xmlsitemap_help($section) {
-  switch ($section) {
+function xmlsitemap_help($path, $arg) {
+  switch ($path) {
     case 'admin/settings/xmlsitemap':
     case 'admin/settings/xmlsitemap/settings':
       return t('The following options allow you to alter the behavior of the XML Sitemap module. Your site map can be found at !url.', array('!url' => l(url('sitemap.xml', array('absolute' => TRUE)), 'sitemap.xml')));
@@ -388,8 +388,8 @@
   return system_settings_form($form);
 }
 
-function xmlsitemap_admin_settings_validate($form_id, $form_values) {
-  if ($form_values['xmlsitemap_chunk_size'] > 50000) {
+function xmlsitemap_admin_settings_validate($form, &$form_state) {
+  if ($form_state['values']['xmlsitemap_chunk_size'] > 50000) {
     form_set_error('xmlsitemap_chunk_size', t('Cannot send more than 50,000 links at one time.'));
   }
   else {
@@ -431,21 +431,21 @@
   return system_settings_form($form);
 }
 
-function xmlsitemap_admin_settings_additional_validate($form_id, $form_values) {
-  if ($form_values['priority'] > 1 || $form_values['priority'] < 0) {
+function xmlsitemap_admin_settings_additional_validate($form, &$form_state) {
+  if ($form_state['values']['priority'] > 1 || $form_state['values']['priority'] < 0) {
     form_set_error('priority', t('Priority must be between 0.0 and 1.0.'));
   }
 }
 
-function xmlsitemap_admin_settings_additional_submit($form_id, $form_values) {
-  if ($form_values['priority'] == '') {
-    $form_values['priority'] = '0.5';
+function xmlsitemap_admin_settings_additional_submit($form, &$form_state) {
+  if ($form_state['values']['priority'] == '') {
+    $form_state['values']['priority'] = '0.5';
   }
   else {
-    $form_values['priority'] = number_format($form_values['priority'], 1);
+    $form_state['values']['priority'] = number_format($form_state['values']['priority'], 1);
   }
-  $old_pages = explode("\n", $form_values['old_pages']);
-  $pages = explode("\n", $form_values['pages']);
+  $old_pages = explode("\n", $form_state['values']['old_pages']);
+  $pages = explode("\n", $form_state['values']['pages']);
   foreach ($pages as $key => $page) {
     $pages[$key] = trim($page);
   }
@@ -478,8 +478,8 @@
       variable_set('xmlsitemap_update', TRUE);
     }
   }
-  db_query('UPDATE {xmlsitemap_additional} SET priority = %s', $form_values['priority']);
-  variable_set('xmlsitemap_priority', $form_values['priority']);
+  db_query('UPDATE {xmlsitemap_additional} SET priority = %s', $form_state['values']['priority']);
+  variable_set('xmlsitemap_priority', $form_state['values']['priority']);
 }
 
 /**
@@ -560,10 +560,10 @@
     }
     if (variable_get('xmlsitemap_logacc', 0)) {
       if (strpos(getenv('HTTP_USER_AGENT'), 'Googlebot') === FALSE) {
-        watchdog('xmlsitemap', t('!sitemap downloaded by @user-agent at @address.', array('!sitemap' => $type, '@user-agent' => getenv('HTTP_USER_AGENT'), '@address' => getenv('REMOTE_ADDR'))));
+        watchdog('xmlsitemap', '!sitemap downloaded by @user-agent at @address.', array('!sitemap' => $type, '@user-agent' => getenv('HTTP_USER_AGENT'), '@address' => getenv('REMOTE_ADDR')));
       }
       else {
-        watchdog('xmlsitemap', t('!sitemap downloaded by Google.', array('!sitemap' => $type)));
+        watchdog('xmlsitemap', '!sitemap downloaded by Google.', array('!sitemap' => $type));
       }
     }
   }
@@ -1337,8 +1337,8 @@
   if (!empty($alias)) {
     $result = $alias;
   }
-  if (function_exists('custom_url_rewrite')) {
-    $result = custom_url_rewrite('alias', $result, $path, $path_language);
+  if (function_exists('url')) {
+    $result = url($path, $alias, array(),  $path_language);
   }
   return $result;
 }
cvs diff: Diffing docs
cvs diff: Diffing po