Index: xmlsitemap_menu/xmlsitemap_menu.info
===================================================================
RCS file: xmlsitemap_menu/xmlsitemap_menu.info
diff -N xmlsitemap_menu/xmlsitemap_menu.info
--- xmlsitemap_menu/xmlsitemap_menu.info	6 Jun 2009 23:52:58 -0000	1.1.4.9
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,7 +0,0 @@
-; $Id: xmlsitemap_menu.info,v 1.1.4.9 2009/06/06 23:52:58 earnie Exp $
-name = XML sitemap menu
-description = Add specified menu item links to the sitemap.
-package = XML sitemap
-dependencies[] = menu
-dependencies[] = xmlsitemap
-core = "6.x"
Index: xmlsitemap_menu/xmlsitemap_menu.install
===================================================================
RCS file: xmlsitemap_menu/xmlsitemap_menu.install
diff -N xmlsitemap_menu/xmlsitemap_menu.install
--- xmlsitemap_menu/xmlsitemap_menu.install	6 Jun 2009 23:52:58 -0000	1.1.4.37
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,147 +0,0 @@
-<?php
-// $Id: xmlsitemap_menu.install,v 1.1.4.37 2009/06/06 23:52:58 earnie Exp $
-
-/**
- * @file
- * Install file for XML sitemap menu.
- */
-
-/*****************************************************************************
- * Drupal hooks.
- ****************************************************************************/
-
-/**
- * Implementation of hook_enable().
- */
-function xmlsitemap_menu_enable() {
-  xmlsitemap_flag_sitemap();
-}
-
-/**
- * Implementation of hook_disable().
- */
-function xmlsitemap_menu_disable() {
-  xmlsitemap_flag_sitemap();
-}
-
-/**
- * Implementation of hook_install().
- */
-function xmlsitemap_menu_install() {
-  if (db_result(db_query("SELECT menu_name FROM {menu_custom} WHERE menu_name = 'menu-xmlsitemap'")) != 'menu-xmlsitemap') {
-    db_query("INSERT INTO {menu_custom} (menu_name, title, description) VALUES ('menu-xmlsitemap', '%s', '%s')",
-      array(
-        t('XML sitemap'),
-        t('A custom menu added by <em>XML sitemap menu</em> module, which can optionally be used as a source for menu links in the sitemap for more fine-grained control.'),
-      )
-    );
-    if (!variable_get('menu_rebuild_needed', FALSE)) {
-      variable_set('menu_rebuild_needed', TRUE);
-    }
-    db_query("UPDATE {system} SET weight = 10 WHERE name = 'xmlsitemap_menu'");
-  }
-}
-
-/**
- * Implementation of hook_update_N().
- */
-function xmlsitemap_menu_update_6000() {
-  $ret = array();
-  $result = update_sql("DELETE FROM {variable} WHERE name = 'xmlsitemap_menu_custom_menu'");
-  if ($result['success']) {
-    $ret[] = $result;
-  }
-  if (db_result(db_query("SELECT menu_name FROM {menu_custom} WHERE menu_name = 'menu-xmlsitemap'")) != 'menu-xmlsitemap') {
-    $ret[] = update_sql("INSERT INTO {menu_custom} (menu_name, title, description) VALUES ('menu-xmlsitemap', '". t('XML sitemap') ."', '". t('A custom menu added by <em>XML sitemap menu</em> module, which can optionally be used as a source for menu links in the sitemap for more fine-grained control.') ."')");
-    if (!variable_get('menu_rebuild_needed', FALSE)) {
-      variable_set('menu_rebuild_needed', TRUE);
-      $ret[] = array(
-        'success' => TRUE,
-        'query' => 'UPDATE MENU CALLBACKS',
-      );
-    }
-  }
-  return $ret;
-}
-
-/**
- * Implementation of hook_update_N().
- */
-function xmlsitemap_menu_update_6100() {
-  return array();
-}
-
-/**
- * Implementation of hook_update_N().
- */
-function xmlsitemap_menu_update_6101() {
-  return array();
-}
-
-/**
- * Implementation of hook_update_N().
- */
-function xmlsitemap_menu_update_6102() {
-  $ret[] = update_sql("DELETE FROM {menu_custom} WHERE menu_name = '1'");
-  return $ret;
-}
-
-/**
- * Implementation of hook_update_N().
- */
-function xmlsitemap_menu_update_6103() {
-  return array();
-}
-
-/**
- * Implementation of hook_update_N().
- */
-function xmlsitemap_menu_update_6104() {
-  return xmlsitemap_menu_update_6000();
-}
-
-/**
- * Implementation of hook_update_N().
- */
-function xmlsitemap_menu_update_6105() {
-  return array();
-}
-
-/**
- * Implementation of hook_update_N().
- */
-function xmlsitemap_menu_update_6106() {
-  $ret[] = update_sql("UPDATE {system} SET weight = 10 WHERE name = 'xmlsitemap_menu'");
-  return $ret;
-}
-
-/**
- * Implementation of hook_update_N().
- */
-function xmlsitemap_menu_update_6107() {
-  return array();
-}
-
-/**
- * Implementation of hook_update_N().
- */
-function xmlsitemap_menu_update_6108() {
-  return array();
-}
-
-/**
- * Implementation of hook_update_N().
- */
-function xmlsitemap_menu_update_6109() {
-  $ret[] = update_sql("UPDATE {menu_custom} SET description ='". t('A custom menu added by <em>XML sitemap menu</em> module, which can optionally be used as a source for menu links in the sitemap for more fine-grained control.'). "' WHERE menu_name = 'menu-xmlsitemap'");
-  return $ret;
-}
-
-/**
- * Implementation of hook_uninstall().
- */
-function xmlsitemap_menu_uninstall() {
-  db_query("DELETE FROM {menu_links} WHERE menu_name = 'menu-xmlsitemap'");
-  db_query("DELETE FROM {menu_custom} WHERE menu_name = 'menu-xmlsitemap'");
-  db_query("DELETE FROM {variable} WHERE name LIKE 'xmlsitemap\_menu\_%'");
-}
Index: xmlsitemap_menu/xmlsitemap_menu.module
===================================================================
RCS file: xmlsitemap_menu/xmlsitemap_menu.module
diff -N xmlsitemap_menu/xmlsitemap_menu.module
--- xmlsitemap_menu/xmlsitemap_menu.module	6 Jun 2009 23:52:58 -0000	1.1.4.46
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,156 +0,0 @@
-<?php
-// $Id: xmlsitemap_menu.module,v 1.1.4.46 2009/06/06 23:52:58 earnie Exp $
-
-/**
- * @file
- * Adds menu items to the sitemap.
- */
-
-/**
- * @addtogroup xmlsitemap
- * @{
- */
-
-/*****************************************************************************
- * Drupal hooks.
- ****************************************************************************/
-
-/**
- * Implementation of hook_form_alter().
- */
-function xmlsitemap_menu_form_alter(&$form, $form_state, $form_id) {
-  switch ($form_id) {
-    case 'menu_edit_item':
-    case 'menu_edit_menu':
-    case 'menu_overview_form':
-      $form['#submit'][] = 'xmlsitemap_menu_update_sitemap_submit';
-      break;
-  }
-}
-
-/**
- * Implementation of hook_form_FORM_ID_alter().
- */
-function xmlsitemap_menu_form_xmlsitemap_settings_alter(&$form, &$from_state) {
-  $form['xmlsitemap_menu'] = array(
-    '#type' => 'fieldset',
-    '#title' => t('Menu settings'),
-    '#description' => t('The settings for the menus to include in the sitemap.'),
-    '#collapsible' => TRUE,
-    '#weight' => 0,
-  );
-  $form['xmlsitemap_menu']['xmlsitemap_menu_menus_changefreq'] = array(
-    '#type' => 'select',
-    '#title' => t('Menu links change frequency'),
-    '#description' => t('The change frequency associated with the menu links.'),
-    '#default_value' => variable_get('xmlsitemap_menu_menus_changefreq', 3600),
-    '#options' => array(
-      '3600' => 'Hourly',
-      '86400' => 'Daily',
-      '604800' => 'Weekly',
-      '2419200' => 'Monthly',
-      '29030400' => 'Yearly',
-    ),
-  );
-  $options = xmlsitemap_priority_options('default');
-  $options['-2'] = t('Calculated from the menu items weight');
-  $form['xmlsitemap_menu']['xmlsitemap_menu_priority'] = array(
-    '#type' => 'select',
-    '#title' => t('Menu items priority'),
-    '#description' => t("The priority assigned to the menu items."),
-    '#default_value' => variable_get('xmlsitemap_menu_priority', -2.0),
-    '#options' => $options,
-  );
-  $options = array();
-  $result = db_query("SELECT menu_name, title FROM {menu_custom}");
-  while ($menu = db_fetch_array($result)) {
-    $options[$menu['menu_name']] = empty($menu['title']) ? $menu['menu_name'] : $menu['title'];
-  }
-  $default_values = variable_get('xmlsitemap_menu_menus', array('menu-xmlsitemap'));
-  // If a menu is not present, remove it from the default settings.
-  foreach ($default_values as $opt) {
-    if (!isset($options[$opt])) {
-      unset($default_values[$opt]);
-    }
-  }
-  if (!empty($options)) {
-    $form['xmlsitemap_menu']['xmlsitemap_menu_menus'] = array(
-      '#type' => 'checkboxes',
-      '#title' => t('Menus to include in the sitemap'),
-      '#default_value' => $default_values,
-      '#options' => $options,
-      '#checkall' => TRUE,
-    );
-  }
-}
-
-/**
- * Implementation of hook_xmlsitemap_description().
- */
-function xmlsitemap_menu_xmlsitemap_description() {
-  return '<dt>'. t('XML sitemap menu') .'</dt>'.
-    '<dd>'. t('The module allows menu items to be added to the sitemap. You can choose the menus to include on the XML sitemap administration page and can add and remove menu items on the <a href="@menu">menu administration</a> page. The priority of a menu item is determined by its weight.', array('@menu' => url('admin/build/menu'))) .'</dd>';
-}
-
-/**
- * Implementation of hook_xmlsitmap_links().
- */
-function xmlsitemap_menu_xmlsitemap_links() {
-  $menus = array_filter(variable_get('xmlsitemap_menu_menus', array('menu-xmlsitemap')), 'is_string');
-  foreach ($menus as $menu) {
-    $result = db_query("SELECT ml.mlid
-      FROM {menu_links} ml
-      LEFT JOIN {menu_router} m ON m.path = ml.router_path
-      WHERE  ml.menu_name = '%s'
-      ORDER BY ml.mlid ASC",
-      $menu
-    );
-    $row = new stdClass();
-    $row->module = 'xmlsitemap_menu';
-    $row->type = 'menu';
-    $priority = variable_get('xmlsitemap_menu_priority', -2.0);
-    while ($mlid = db_result($result)) {
-      $link = menu_link_load($mlid);
-      // Avoid external links, or links to the front page;
-      // both have $link['external'] set to 1.
-      if (!$link['external'] && !$link['hidden'] && $link['access'] == 1) {
-        $row->loc = $link['href'];
-        $changefreq = variable_get('xmlsitemap_menu_menus_changefreq', 3600);
-        $row->changed = REQUEST_TIME - $changefreq;
-        $row->changefreq = $changefreq;
-        if ($priority == -2.0) {
-          $row->priority = 1.0 - min(max(round(($link['weight'] + 50) / 100, 1), 0.0), 1.0);
-        }
-        else {
-          if (!isset($priority)) {
-            $priority = -1.0;
-          }
-          $row->priority = $priority;
-        }
-        $old_row = db_fetch_object(db_query("SELECT lid, type, priority FROM {xmlsitemap} WHERE loc = '%s'", $row->loc));
-        if ($old_row === FALSE) {
-          drupal_write_record('xmlsitemap', $row);
-        }
-        elseif ($old_row->type == 'menu' && $old_row->priority != $row->priority) {
-          $row->lid = $old_row->lid;
-          drupal_write_record('xmlsitemap', $row, 'lid');
-        }
-      }
-    }
-  }
-}
-
-/*****************************************************************************
- * Menu callbacks / form builders, submit/validate functions.
- ****************************************************************************/
-
-/**
- * Add submit actions to forms.
- */
-function xmlsitemap_menu_update_sitemap_submit($form, &$form_state) {
-  xmlsitemap_flag_sitemap();
-}
-
-/**
- * @} End of "addtogroup xmlsitemap".
- */
Index: xmlsitemap_menu/translations/fr.po
===================================================================
RCS file: xmlsitemap_menu/translations/fr.po
diff -N xmlsitemap_menu/translations/fr.po
--- xmlsitemap_menu/translations/fr.po	6 Jun 2009 23:52:58 -0000	1.1.2.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,87 +0,0 @@
-# $Id: fr.po,v 1.1.2.3 2009/06/06 23:52:58 earnie Exp $
-#
-# French translation of Drupal (general)
-# Copyright YEAR NAME <EMAIL@ADDRESS>
-# Generated from files:
-#  xmlsitemap.module,v 1.1.2.56 2009/03/18 21:22:29 kiam
-#  xmlsitemap_node.module,v 1.19.2.81 2009/03/23 14:00:46 kiam
-#  xmlsitemap_term.module,v 1.11.2.43 2009/03/19 13:19:50 kiam
-#  xmlsitemap_engines.module,v 1.5.2.19 2009/02/15 00:36:18 kiam
-#  xmlsitemap.install,v 1.1.2.30 2009/03/14 18:52:18 kiam
-#  xmlsitemap.info,v 1.1.2.2 2009/03/08 23:47:46 kiam
-#  xmlsitemap_engines.info,v 1.2.2.1 2009/03/08 23:47:46 kiam
-#  xmlsitemap_file.info,v 1.1.4.3 2008/11/28 19:11:58 kiam
-#  xmlsitemap_helper.info,v 1.1.2.1 2009/03/08 23:47:46 kiam
-#  xmlsitemap_menu.install,v 1.1.4.26 2009/03/11 16:01:08 kiam
-#  xmlsitemap_menu.info,v 1.1.4.3 2009/03/08 23:47:47 kiam
-#  xmlsitemap_node.info,v 1.2.2.1 2009/03/08 23:47:48 kiam
-#  xmlsitemap_term.info,v 1.2.2.1 2009/02/19 16:15:46 kiam
-#  xmlsitemap_user.info,v 1.2.2.1 2009/03/08 23:47:48 kiam
-#  xmlsitemap_file.module,v 1.1.4.35 2009/03/19 13:19:56 kiam
-#  xmlsitemap_helper.module,v 1.1.2.4 2009/03/18 21:04:15 kiam
-#  xmlsitemap_helper.install.inc,v 1.1.2.1 2009/03/08 23:47:47 kiam
-#  xmlsitemap_user.module,v 1.12.2.58 2009/03/19 13:19:42 kiam
-#  xmlsitemap_menu.module,v 1.1.4.29 2009/03/23 13:51:26 kiam
-#  xmlsitemap_node.install,v 1.9.2.46 2009/03/11 16:01:03 kiam
-#  xmlsitemap_user.install,v 1.6.2.43 2009/03/11 16:00:59 kiam
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: French Translation for xmlsitemap_menu drupal6 module\n"
-"POT-Creation-Date: 2009-04-01 11:17+0200\n"
-"PO-Revision-Date: 2009-04-01 11:19+0100\n"
-"Last-Translator: Sylvain Moreau <sylvain.moreau@ows.fr>\n"
-"Language-Team: Sylvain Moreau, OWS <sylvain.moreau@ows.fr>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n>1);\n"
-"X-Poedit-Language: French\n"
-"X-Poedit-Country: FRANCE\n"
-
-#: xmlsitemap_menu.module:22
-#: xmlsitemap_menu.info:0
-msgid "XML Sitemap: Menu"
-msgstr "XML Sitemap : Menu"
-
-#: xmlsitemap_menu.module:23
-msgid "The module allows menu items to be added to the site map. You can choose the menus to include on the XML Sitemap administration page and can add and remove menu items on the <a href=\"@menu\">menu administration</a> page. The priority of a menu item is determined by its weight."
-msgstr "Le module permet aux éléments de menu d'être ajoutés au plan du site. Vous pouvez sélectionner les menus à inclure sur la page d'administration de XML Sitemap, et pouvez ajouter ou supprimer des éléments de menu depuis la page d'<a href=\"@menu\">administration des menus</a>. La priorité d'un élement de menu est déterminée par son poids."
-
-#: xmlsitemap_menu.module:84
-msgid "Menu settings"
-msgstr "Paramètres du menu"
-
-#: xmlsitemap_menu.module:85
-msgid "The settings for the menus to include in the site map."
-msgstr "Les paramètres pour les menus à inclure dans le plan du site."
-
-#: xmlsitemap_menu.module:91
-msgid "Menu links change frequency"
-msgstr "Fréquence de modification des liens de menus"
-
-#: xmlsitemap_menu.module:92
-msgid "The change frequency associated with the menu links."
-msgstr "La fréquence de modification associée aux liens de menus."
-
-#: xmlsitemap_menu.module:104
-msgid "Menus to include in the site map"
-msgstr "Menus à inclure dans le plan du site"
-
-#: xmlsitemap_menu.module:0
-msgid "xmlsitemap_menu"
-msgstr "xmlsitemap_menu"
-
-#: xmlsitemap_menu.install:36;55
-#: xmlsitemap_menu.info:0
-msgid "XML Sitemap"
-msgstr "XML Sitemap"
-
-#: xmlsitemap_menu.install:37;55
-msgid "The menu from where <em>XML Sitemap: Menu</em> looks for the menus to add to the sitemap."
-msgstr "Le menu dans lequel <em>XML Sitemap : Menu</em> cherche des menus à ajouter au plan du site."
-
-#: xmlsitemap_menu.info:0
-msgid "Adds menu items to the site map."
-msgstr "Ajoute des élements de menu au plan du site."
-
Index: xmlsitemap_menu/translations/xmlsitemap_menu.pot
===================================================================
RCS file: xmlsitemap_menu/translations/xmlsitemap_menu.pot
diff -N xmlsitemap_menu/translations/xmlsitemap_menu.pot
--- xmlsitemap_menu/translations/xmlsitemap_menu.pot	6 Jun 2009 23:52:58 -0000	1.1.2.5
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,78 +0,0 @@
-# $Id: xmlsitemap_menu.pot,v 1.1.2.5 2009/06/06 23:52:58 earnie Exp $
-#
-# LANGUAGE translation of Drupal (general)
-# Copyright YEAR NAME <EMAIL@ADDRESS>
-# Generated from files:
-#  xmlsitemap_menu.module,v 1.1.4.35 2009/04/24 18:25:50 kiam
-#  xmlsitemap_menu.info,v 1.1.4.5 2009/04/24 18:33:46 kiam
-#  xmlsitemap_menu.install,v 1.1.4.33 2009/04/24 18:25:50 kiam
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PROJECT VERSION\n"
-"POT-Creation-Date: 2009-04-26 00:59+0200\n"
-"PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
-"Last-Translator: NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-
-#: xmlsitemap_menu.module:36
-msgid "Calculated from the menu items weight"
-msgstr ""
-
-#: xmlsitemap_menu.module:39
-msgid "Menu items priority"
-msgstr ""
-
-#: xmlsitemap_menu.module:40
-msgid "The priority assigned to the menu items."
-msgstr ""
-
-#: xmlsitemap_menu.module:59
-msgid "Menu settings"
-msgstr ""
-
-#: xmlsitemap_menu.module:60
-msgid "The settings for the menus to include in the site map."
-msgstr ""
-
-#: xmlsitemap_menu.module:66
-msgid "Menu links change frequency"
-msgstr ""
-
-#: xmlsitemap_menu.module:67
-msgid "The change frequency associated with the menu links."
-msgstr ""
-
-#: xmlsitemap_menu.module:79
-msgid "Menus to include in the site map"
-msgstr ""
-
-#: xmlsitemap_menu.module:91 xmlsitemap_menu.info:0
-msgid "XML Sitemap: Menu"
-msgstr ""
-
-#: xmlsitemap_menu.module:92
-msgid "The module allows menu items to be added to the site map. You can choose the menus to include on the XML Sitemap administration page and can add and remove menu items on the <a href=\"@menu\">menu administration</a> page. The priority of a menu item is determined by its weight."
-msgstr ""
-
-#: xmlsitemap_menu.module:0
-msgid "xmlsitemap_menu"
-msgstr ""
-
-#: xmlsitemap_menu.install:34;53 xmlsitemap_menu.info:0
-msgid "XML Sitemap"
-msgstr ""
-
-#: xmlsitemap_menu.install:35;53;128
-msgid "A custom menu added by <em>XML Sitemap: Menu</em> module, which can optionally be used as a source for menu links in the sitemap for more fine-grained control."
-msgstr ""
-
-#: xmlsitemap_menu.info:0
-msgid "Adds menu items to the site map."
-msgstr ""
-
