diff -upNr -x CVS -x CHANGELOG.txt -x '.#*' -I '.*\$Id.*' xmlsitemap-DRUPAL-6--1/translations/general.de.po xmlsitemap-DRUPAL-6--1-I456736/translations/general.de.po --- xmlsitemap-DRUPAL-6--1/translations/general.de.po 2009-06-05 19:15:57 -0400 +++ xmlsitemap-DRUPAL-6--1-I456736/translations/general.de.po 1969-12-31 19:00:00 -0500 @@ -1,67 +0,0 @@ -# $Id: general.de.po,v 1.1.2.1 2009/06/05 23:15:57 hass Exp $ -# -# LANGUAGE translation of Drupal (gsitemap.module) -# Copyright YEAR NAME -# Generated from files: -# gsitemap.module,v 1.56.2.7 2007/03/18 21:55:39 darrenoh -# gsitemap.info,v 1.3.2.3 2007/02/13 15:57:06 darrenoh -# -msgid "" -msgstr "" -"Project-Id-Version: German translation of xmlsitemap\n" -"POT-Creation-Date: 2009-06-06 01:06+0200\n" -"PO-Revision-Date: 2009-06-06 01:11+0100\n" -"Last-Translator: Alexander Haß\n" -"Language-Team: Alexander Hass\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: German\n" -"X-Poedit-Country: GERMANY\n" -"X-Poedit-SourceCharset: utf-8\n" - -#: xmlsitemap/xmlsitemap.cron.php:32;39 -#: xmlsitemap/xmlsitemap.admin.inc:164;168 -#: xmlsitemap/xmlsitemap.module:609;620;626;0 -#: xmlsitemap_engines/xmlsitemap_engines.module:155;158 -msgid "xmlsitemap" -msgstr "xmlsitemap" - -#: xmlsitemap/xmlsitemap.admin.inc:107;386 -#: xmlsitemap_node/xmlsitemap_node.module:63 -#: xmlsitemap_taxonomy/xmlsitemap_taxonomy.module:55;76 -msgid "Priority" -msgstr "Priorität" - -#: xmlsitemap/xmlsitemap.admin.inc:242 -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:45 -msgid "Hourly" -msgstr "Stündlich" - -#: xmlsitemap/xmlsitemap.admin.inc:243 -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:44 -msgid "Daily" -msgstr "Täglich" - -#: xmlsitemap/xmlsitemap.admin.inc:244 -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:43 -msgid "Weekly" -msgstr "Wöchentlich" - -#: xmlsitemap/xmlsitemap.admin.inc:245 -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:41 -msgid "Monthly" -msgstr "Monatlich" - -#: xmlsitemap/xmlsitemap.admin.inc:246 -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:39 -msgid "Yearly" -msgstr "Jährlich" - -#: xmlsitemap_node/xmlsitemap_node.module:64 -#: xmlsitemap_taxonomy/xmlsitemap_taxonomy.module:56 -#: xmlsitemap_user/xmlsitemap_user.module:108 -msgid "The default priority is %priority." -msgstr "Die Standardpriorität ist %priority." - diff -upNr -x CVS -x CHANGELOG.txt -x '.#*' -I '.*\$Id.*' xmlsitemap-DRUPAL-6--1/translations/general.pot xmlsitemap-DRUPAL-6--1-I456736/translations/general.pot --- xmlsitemap-DRUPAL-6--1/translations/general.pot 2009-06-05 19:08:44 -0400 +++ xmlsitemap-DRUPAL-6--1-I456736/translations/general.pot 1969-12-31 19:00:00 -0500 @@ -1,59 +0,0 @@ -# $Id: general.pot,v 1.1.2.3 2009/06/05 23:08:44 hass Exp $ -# -# LANGUAGE translation of Drupal (general) -# Copyright YEAR NAME -# Generated from files: -# xmlsitemap.cron.php,v 1.1.2.11 2009/05/25 22:41:55 kiam -# xmlsitemap.admin.inc,v 1.1.2.17 2009/05/26 10:43:07 kiam -# xmlsitemap.module,v 1.1.2.128 2009/05/25 12:01:33 kiam -# xmlsitemap_engines.module,v 1.5.2.42 2009/05/25 02:52:15 kiam -# xmlsitemap_node.module,v 1.19.2.122 2009/05/26 11:03:49 kiam -# xmlsitemap_taxonomy.module,v 1.1.2.11 2009/06/04 21:40:25 davereid -# xmlsitemap_engines.admin.inc,v 1.1.2.9 2009/05/23 14:08:18 kiam -# xmlsitemap_user.module,v 1.12.2.100 2009/05/26 11:03:52 kiam -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2009-06-06 01:06+0200\n" -"PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" -"Last-Translator: NAME \n" -"Language-Team: LANGUAGE \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/xmlsitemap.cron.php:32;39 xmlsitemap/xmlsitemap.admin.inc:164;168 xmlsitemap/xmlsitemap.module:609;620;626;0 xmlsitemap_engines/xmlsitemap_engines.module:155;158 -msgid "xmlsitemap" -msgstr "" - -#: xmlsitemap/xmlsitemap.admin.inc:107;386 xmlsitemap_node/xmlsitemap_node.module:63 xmlsitemap_taxonomy/xmlsitemap_taxonomy.module:55;76 -msgid "Priority" -msgstr "" - -#: xmlsitemap/xmlsitemap.admin.inc:242 xmlsitemap_engines/xmlsitemap_engines.admin.inc:45 -msgid "Hourly" -msgstr "" - -#: xmlsitemap/xmlsitemap.admin.inc:243 xmlsitemap_engines/xmlsitemap_engines.admin.inc:44 -msgid "Daily" -msgstr "" - -#: xmlsitemap/xmlsitemap.admin.inc:244 xmlsitemap_engines/xmlsitemap_engines.admin.inc:43 -msgid "Weekly" -msgstr "" - -#: xmlsitemap/xmlsitemap.admin.inc:245 xmlsitemap_engines/xmlsitemap_engines.admin.inc:41 -msgid "Monthly" -msgstr "" - -#: xmlsitemap/xmlsitemap.admin.inc:246 xmlsitemap_engines/xmlsitemap_engines.admin.inc:39 -msgid "Yearly" -msgstr "" - -#: xmlsitemap_node/xmlsitemap_node.module:64 xmlsitemap_taxonomy/xmlsitemap_taxonomy.module:56 xmlsitemap_user/xmlsitemap_user.module:108 -msgid "The default priority is %priority." -msgstr "" - diff -upNr -x CVS -x CHANGELOG.txt -x '.#*' -I '.*\$Id.*' xmlsitemap-DRUPAL-6--1/xmlsitemap/translations/xmlsitemap.de.po xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap/translations/xmlsitemap.de.po --- xmlsitemap-DRUPAL-6--1/xmlsitemap/translations/xmlsitemap.de.po 2009-06-05 19:43:28 -0400 +++ xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap/translations/xmlsitemap.de.po 1969-12-31 19:00:00 -0500 @@ -1,375 +0,0 @@ -# $Id: xmlsitemap.de.po,v 1.1.2.2 2009/06/05 23:43:28 hass Exp $ -# -# LANGUAGE translation of Drupal (gsitemap.module) -# Copyright YEAR NAME -# Generated from files: -# gsitemap.module,v 1.56.2.7 2007/03/18 21:55:39 darrenoh -# gsitemap.info,v 1.3.2.3 2007/02/13 15:57:06 darrenoh -# -msgid "" -msgstr "" -"Project-Id-Version: German translation of xmlsitemap\n" -"POT-Creation-Date: 2009-06-06 01:06+0200\n" -"PO-Revision-Date: 2009-06-06 01:42+0100\n" -"Last-Translator: Alexander Haß\n" -"Language-Team: Alexander Hass\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: German\n" -"X-Poedit-Country: GERMANY\n" -"X-Poedit-SourceCharset: utf-8\n" - -#: xmlsitemap/xmlsitemap.cron.php:32 -msgid "Cache files building task has been running for more than an hour and is most likely stuck." -msgstr "" - -#: xmlsitemap/xmlsitemap.cron.php:39 -#: xmlsitemap/xmlsitemap.module:626 -msgid "Attempting to re-run the cache files building task while it is already running." -msgstr "" - -#: xmlsitemap/xmlsitemap.admin.inc:39 -msgid "edit" -msgstr "Bearbeiten" - -#: xmlsitemap/xmlsitemap.admin.inc:42 -msgid "delete" -msgstr "Löschen" - -#: xmlsitemap/xmlsitemap.admin.inc:48;114 -msgid "Save" -msgstr "Speichern" - -#: xmlsitemap/xmlsitemap.admin.inc:69 -msgid "An error occurred while saving the links." -msgstr "Beim Speichern der Links ist ein Fehler aufgetreten." - -#: xmlsitemap/xmlsitemap.admin.inc:72 -msgid "The links have been saved." -msgstr "Die Links wurden gespeichert." - -#: xmlsitemap/xmlsitemap.admin.inc:92 -msgid "Relative path" -msgstr "Relativer Pfad" - -#: xmlsitemap/xmlsitemap.admin.inc:93 -msgid "The path must be relative to the Drupal installation directory, and accessible from the anonymous user. If the path is a path alias, the original path will be used." -msgstr "" - -#: xmlsitemap/xmlsitemap.admin.inc:101;385 -msgid "Enabled" -msgstr "Aktiviert" - -#: xmlsitemap/xmlsitemap.admin.inc:103 -msgid "If selected, the link will appear in the sitemap." -msgstr "Sobald aktiviert, wird der Link in der Sitemap erscheinen." - -#: xmlsitemap/xmlsitemap.admin.inc:110 -msgid "The priority of a link determines its position in the sitemap; the links with a higher priority will appear first in the sitemap." -msgstr "" - -#: xmlsitemap/xmlsitemap.admin.inc:136 -msgid "The path is either invalid or is not accessible from the anonymous user." -msgstr "" - -#: xmlsitemap/xmlsitemap.admin.inc:141 -msgid "The path has been already used." -msgstr "Der Pfad wurde schon verwendet." - -#: xmlsitemap/xmlsitemap.admin.inc:163;164 -msgid "The link %link has been updated." -msgstr "Der Link %link wurde aktualisiert." - -#: xmlsitemap/xmlsitemap.admin.inc:167;168 -msgid "An error occurred while saving the link %link." -msgstr "Beim Speichern des Links %link ist ein Fehler aufgetreten." - -#: xmlsitemap/xmlsitemap.admin.inc:179 -msgid "Are you sure you want to delete the link?" -msgstr "Soll der Link wirklich gelöscht werden?" - -#: xmlsitemap/xmlsitemap.admin.inc:181 -msgid "This action cannot be undone." -msgstr "Diese Aktion kann nicht rückgängig gemacht werden." - -#: xmlsitemap/xmlsitemap.admin.inc:182 -#: xmlsitemap/xmlsitemap.module:140 -msgid "Delete" -msgstr "Löschen" - -#: xmlsitemap/xmlsitemap.admin.inc:183 -msgid "Cancel" -msgstr "Abbrechen" - -#: xmlsitemap/xmlsitemap.admin.inc:194 -msgid "The link %link has been deleted." -msgstr "Der Link %link wurde gelöscht." - -#: xmlsitemap/xmlsitemap.admin.inc:206 -msgid "Settings" -msgstr "Einstellungen" - -#: xmlsitemap/xmlsitemap.admin.inc:212 -#, fuzzy -msgid "Add all the links to the default language sitemap" -msgstr "Alle Links zu der standardmäßigen Sprachsitemap hinzufügen" - -#: xmlsitemap/xmlsitemap.admin.inc:214 -msgid "This option will be used only when the language negotiation uses a path prefix mechanism." -msgstr "" - -#: xmlsitemap/xmlsitemap.admin.inc:218 -msgid "Cron limit" -msgstr "Cron-Begrenzung" - -#: xmlsitemap/xmlsitemap.admin.inc:219 -msgid "The number of links that are updated in each pass of a cron maintenance task. Choosing a number too high could cause the other modules cron tasks to not be executed; use the higher numbers only when you are sure it will not cause any problems on your Drupal installation." -msgstr "" - -#: xmlsitemap/xmlsitemap.admin.inc:225 -msgid "Cache directory" -msgstr "Cache-Verzeichnis" - -#: xmlsitemap/xmlsitemap.admin.inc:229 -msgid "The directory where the cache files are created; change it only if you are having problems with the default setting." -msgstr "" - -#: xmlsitemap/xmlsitemap.admin.inc:233 -msgid "Front page" -msgstr "Startseite" - -#: xmlsitemap/xmlsitemap.admin.inc:238 -msgid "Front page change frequency" -msgstr "Änderungsfrequenz der Startseite" - -#: xmlsitemap/xmlsitemap.admin.inc:239 -msgid "The change frequency associated with the front page." -msgstr "" - -#: xmlsitemap/xmlsitemap.admin.inc:251 -msgid "Front page priority" -msgstr "Priorität der Startseite" - -#: xmlsitemap/xmlsitemap.admin.inc:252 -msgid "The absolute priority for the front page." -msgstr "Die absolute Priorität für die Startseite." - -#: xmlsitemap/xmlsitemap.admin.inc:285 -msgid "Update the cache files" -msgstr "Die Cache-Dateien aktualisieren" - -#: xmlsitemap/xmlsitemap.admin.inc:290 -msgid "Update cache" -msgstr "Cache aktualisieren" - -#: xmlsitemap/xmlsitemap.admin.inc:315 -#, fuzzy -msgid "Updating the cache files" -msgstr "Die Cache-Dateien werden aktualisiert" - -#: xmlsitemap/xmlsitemap.admin.inc:379 -msgid "No additional links have been created." -msgstr "Es wurden keine zusätzlichen Links erstellt." - -#: xmlsitemap/xmlsitemap.admin.inc:384 -msgid "Path" -msgstr "Pfad" - -#: xmlsitemap/xmlsitemap.admin.inc:387 -msgid "Operations" -msgstr "Operationen" - -#: xmlsitemap/xmlsitemap.admin.inc:409 -msgid "Updating %module cache files (@count links of @max)." -msgstr "%module Cache-Dateien werden aktualisiert (@count Links von @max)." - -#: xmlsitemap/xmlsitemap.admin.inc:428 -msgid "The cache files have been updated." -msgstr "Die Cache-Dateien wurden aktualisiert." - -#: xmlsitemap/xmlsitemap.admin.inc:431 -msgid "The cache file have not been sucessfully updated." -msgstr "Die Cache-Datei konnte nicht erfolgreich aktualisiert werden." - -#: xmlsitemap/xmlsitemap.module:62 -msgid "The sitemap is located at @sitemap." -msgstr "Die Sitemap befindet sich unter @sitemap." - -#: xmlsitemap/xmlsitemap.module:65 -msgid "XML sitemap automatically creates a sitemap that conforms to the sitemaps.org specification. This helps search engines keep their search results up to date." -msgstr "" - -#: xmlsitemap/xmlsitemap.module:66 -msgid "Supporting modules" -msgstr "" - -#: xmlsitemap/xmlsitemap.module:67 -msgid "By itself, the XML sitemap module adds only the front page of your site to the sitemap. Other types of links are handled by supporting modules." -msgstr "" - -#: xmlsitemap/xmlsitemap.module:78 -msgid "Links may be assigned a priority between 0.0 and 1.0. The default priority is 0.5. A priority of Not in sitemap excludes a link from the sitemap." -msgstr "" - -#: xmlsitemap/xmlsitemap.module:79 -msgid "More information is available in the XML sitemap documentation." -msgstr "" - -#: xmlsitemap/xmlsitemap.module:416 -msgid "1.0" -msgstr "1,0" - -#: xmlsitemap/xmlsitemap.module:417 -msgid "0.9" -msgstr "0,9" - -#: xmlsitemap/xmlsitemap.module:418 -msgid "0.8" -msgstr "0,8" - -#: xmlsitemap/xmlsitemap.module:419 -msgid "0.7" -msgstr "0,7" - -#: xmlsitemap/xmlsitemap.module:420 -msgid "0.6" -msgstr "0,6" - -#: xmlsitemap/xmlsitemap.module:421 -msgid "0.5" -msgstr "0,5" - -#: xmlsitemap/xmlsitemap.module:422 -msgid "0.4" -msgstr "0,4" - -#: xmlsitemap/xmlsitemap.module:423 -msgid "0.3" -msgstr "0,3" - -#: xmlsitemap/xmlsitemap.module:424 -msgid "0.2" -msgstr "0,2" - -#: xmlsitemap/xmlsitemap.module:425 -msgid "0.1" -msgstr "0,1" - -#: xmlsitemap/xmlsitemap.module:426 -msgid "0.0" -msgstr "0,0" - -#: xmlsitemap/xmlsitemap.module:429 -msgid "Not in sitemap" -msgstr "Nicht in der Sitemap" - -#: xmlsitemap/xmlsitemap.module:432 -msgid "Default" -msgstr "Standard" - -#: xmlsitemap/xmlsitemap.module:475;96 -#: xmlsitemap/xmlsitemap.info:0;0 -#: xmlsitemap_engines/xmlsitemap_engines.info:0 -#: xmlsitemap_node/xmlsitemap_node.module:52;80 -#: xmlsitemap_node/xmlsitemap_node.info:0 -#: xmlsitemap_taxonomy/xmlsitemap_taxonomy.module:48;70 -#: xmlsitemap_taxonomy/xmlsitemap_taxonomy.info:0 -#: xmlsitemap_user/xmlsitemap_user.module:47;74 -#: xmlsitemap_user/xmlsitemap_user.info:0 -msgid "XML sitemap" -msgstr "XML-Sitemap" - -#: xmlsitemap/xmlsitemap.module:609 -msgid "Cache files building task exceeded the time limit and was aborted." -msgstr "" - -#: xmlsitemap/xmlsitemap.module:620 -msgid "The cache files building task has been running for more than an hour and is most likely stuck." -msgstr "" - -#: xmlsitemap/xmlsitemap.module:182 -msgid "override node settings" -msgstr "Beitragseinstellungen übersteuern" - -#: xmlsitemap/xmlsitemap.module:182 -msgid "override profile settings" -msgstr "Profileinstellungen übersteuern" - -#: xmlsitemap/xmlsitemap.module:97;105 -msgid "Configure the XML sitemap." -msgstr "Die XML-Sitemap konfigurieren." - -#: xmlsitemap/xmlsitemap.module:104 -msgid "Sitemap" -msgstr "Sitemap" - -#: xmlsitemap/xmlsitemap.module:111 -msgid "Additional links" -msgstr "Zusätzliche Links" - -#: xmlsitemap/xmlsitemap.module:119 -msgid "List" -msgstr "Alle anzeigen" - -#: xmlsitemap/xmlsitemap.module:124 -msgid "Add link" -msgstr "Link hinzufügen" - -#: xmlsitemap/xmlsitemap.module:132 -msgid "Tools" -msgstr "Werkzeuge" - -#: xmlsitemap/xmlsitemap.module:149 -msgid "Edit link" -msgstr "Link bearbeiten" - -#: xmlsitemap/xmlsitemap.module:158 -msgid "Sitemap index" -msgstr "Sitemap-Index" - -#: xmlsitemap/xmlsitemap.module:166 -msgid "Sitemap !number" -msgstr "Sitemap !number" - -#: xmlsitemap/xmlsitemap.install:214 -msgid "XML sitemap term has been deprecated in favor of XML sitemap taxonomy; enable it in the modules page." -msgstr "" - -#: xmlsitemap/xmlsitemap.install:263 -msgid "XML sitemap menu has been deprecated, and it is not anymore included in XML sitemap. It seems you have not correctly copied the new files, or you have two different sets of files in two different directories. Verify that you correctly copied the new files, before to proceed." -msgstr "" - -#: xmlsitemap/xmlsitemap.info:0 -msgid "Create a XML sitemap conforming to sitemaps.org specifications." -msgstr "Erzeugt eine XML-Sitemap in Übereinstimmung mit den sitemap.org Spezifikationen." - -#, fuzzy -#~ msgid "Configure the site map." -#~ msgstr "Die Sitemap konfigurieren." -#~ msgid "Configure the behavior for search engines." -#~ msgstr "Das Verhalten für Suchmaschinen konfigurieren." -#~ msgid "General settings" -#~ msgstr "Allgemeine Einstellungen" -#~ msgid "Priority" -#~ msgstr "Priorität" -#~ msgid "Last items successfully processed:" -#~ msgstr "Der letzte Eintrag wurde erfolgreich verarbeitet:" -#~ msgid "xmlsitemap" -#~ msgstr "xmlsitemap" - -#, fuzzy -#~ msgid "Could not create the cache files directory (@directory)" -#~ msgstr "" -#~ "Das Verzeichnis (@directory) zum Dateicaching konnte nicht erstellt " -#~ "werden." -#~ msgid "1 item successfully processed." -#~ msgid_plural "@count items successfully processed." -#~ msgstr[0] "1 Element wurde erfolgreich verarbeitet." -#~ msgstr[1] "@count Elemente wurden erfolgreich verarbeitet." -#~ msgid "XML Sitemap" -#~ msgstr "XML-Sitemap" -#~ msgid "!module_file/!module_revision !install_file/!install_revision" -#~ msgstr "!module_file/!module_revision !install_file/!install_revision" - diff -upNr -x CVS -x CHANGELOG.txt -x '.#*' -I '.*\$Id.*' xmlsitemap-DRUPAL-6--1/xmlsitemap/translations/xmlsitemap.pot xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap/translations/xmlsitemap.pot --- xmlsitemap-DRUPAL-6--1/xmlsitemap/translations/xmlsitemap.pot 2009-06-06 12:58:38 -0400 +++ xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap/translations/xmlsitemap.pot 2009-04-25 19:01:00 -0400 @@ -1,26 +1,17 @@ -# $Id: xmlsitemap.pot,v 1.1.4.3 2009/06/05 23:08:44 hass Exp $ +# $Id: xmlsitemap.pot,v 1.1.4.2 2009/04/25 23:01:00 kiam Exp $ # -# LANGUAGE translation of Drupal (xmlsitemap) +# LANGUAGE translation of Drupal (general) # Copyright YEAR NAME # Generated from files: -# xmlsitemap.cron.php,v 1.1.2.11 2009/05/25 22:41:55 kiam -# xmlsitemap.module,v 1.1.2.128 2009/05/25 12:01:33 kiam -# xmlsitemap.admin.inc,v 1.1.2.17 2009/05/26 10:43:07 kiam -# xmlsitemap.info,v 1.1.2.4 2009/05/05 21:53:44 earnie -# xmlsitemap_engines.info,v 1.2.2.3 2009/05/05 21:53:44 earnie -# xmlsitemap_node.module,v 1.19.2.122 2009/05/26 11:03:49 kiam -# xmlsitemap_node.info,v 1.2.2.4 2009/05/05 21:53:44 earnie -# xmlsitemap_taxonomy.module,v 1.1.2.11 2009/06/04 21:40:25 davereid -# xmlsitemap_taxonomy.info,v 1.1.2.2 2009/05/07 17:10:35 kiam -# xmlsitemap_user.module,v 1.12.2.100 2009/05/26 11:03:52 kiam -# xmlsitemap_user.info,v 1.2.2.4 2009/05/05 21:53:44 earnie -# xmlsitemap.install,v 1.1.2.66 2009/05/27 01:41:34 davereid +# xmlsitemap.module,v 1.1.2.82 2009/04/24 18:26:02 kiam +# xmlsitemap.install,v 1.1.2.42 2009/04/24 18:26:01 kiam +# xmlsitemap.info,v 1.1.2.3 2009/04/24 18:33:50 kiam # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2009-06-06 01:06+0200\n" +"POT-Creation-Date: 2009-04-26 00:49+0200\n" "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" "Last-Translator: NAME \n" "Language-Team: LANGUAGE \n" @@ -29,315 +20,197 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: xmlsitemap/xmlsitemap.cron.php:32 -msgid "Cache files building task has been running for more than an hour and is most likely stuck." +#: xmlsitemap.module:53 +msgid "Configure the site map." msgstr "" -#: xmlsitemap/xmlsitemap.cron.php:39 xmlsitemap/xmlsitemap.module:626 -msgid "Attempting to re-run the cache files building task while it is already running." +#: xmlsitemap.module:56 +msgid "Configure the behavior for search engines." msgstr "" -#: xmlsitemap/xmlsitemap.admin.inc:39 -msgid "edit" +#: xmlsitemap.module:59 +msgid "XML Sitemap automatically creates a site map that conforms to the sitemaps.org specification. This helps search engines keep their search results up to date." msgstr "" -#: xmlsitemap/xmlsitemap.admin.inc:42 -msgid "delete" -msgstr "" - -#: xmlsitemap/xmlsitemap.admin.inc:48;114 -msgid "Save" -msgstr "" - -#: xmlsitemap/xmlsitemap.admin.inc:69 -msgid "An error occurred while saving the links." -msgstr "" - -#: xmlsitemap/xmlsitemap.admin.inc:72 -msgid "The links have been saved." -msgstr "" - -#: xmlsitemap/xmlsitemap.admin.inc:92 -msgid "Relative path" -msgstr "" - -#: xmlsitemap/xmlsitemap.admin.inc:93 -msgid "The path must be relative to the Drupal installation directory, and accessible from the anonymous user. If the path is a path alias, the original path will be used." -msgstr "" - -#: xmlsitemap/xmlsitemap.admin.inc:101;385 -msgid "Enabled" -msgstr "" - -#: xmlsitemap/xmlsitemap.admin.inc:103 -msgid "If selected, the link will appear in the sitemap." -msgstr "" - -#: xmlsitemap/xmlsitemap.admin.inc:110 -msgid "The priority of a link determines its position in the sitemap; the links with a higher priority will appear first in the sitemap." -msgstr "" - -#: xmlsitemap/xmlsitemap.admin.inc:136 -msgid "The path is either invalid or is not accessible from the anonymous user." -msgstr "" - -#: xmlsitemap/xmlsitemap.admin.inc:141 -msgid "The path has been already used." -msgstr "" - -#: xmlsitemap/xmlsitemap.admin.inc:163;164 -msgid "The link %link has been updated." -msgstr "" - -#: xmlsitemap/xmlsitemap.admin.inc:167;168 -msgid "An error occurred while saving the link %link." -msgstr "" - -#: xmlsitemap/xmlsitemap.admin.inc:179 -msgid "Are you sure you want to delete the link?" -msgstr "" - -#: xmlsitemap/xmlsitemap.admin.inc:181 -msgid "This action cannot be undone." +#: xmlsitemap.module:60 +msgid "Supporting modules" msgstr "" -#: xmlsitemap/xmlsitemap.admin.inc:182 xmlsitemap/xmlsitemap.module:140 -msgid "Delete" +#: xmlsitemap.module:61 +msgid "By itself, the XML Sitemap module adds only the front page of your site to the site map. Other types of links are handled by supporting modules." msgstr "" -#: xmlsitemap/xmlsitemap.admin.inc:183 -msgid "Cancel" +#: xmlsitemap.module:70 +msgid "Links may be assigned a priority between 0.0 and 1.0. The default priority is 0.5. A priority of Not in site map excludes a link from the site map." msgstr "" -#: xmlsitemap/xmlsitemap.admin.inc:194 -msgid "The link %link has been deleted." +#: xmlsitemap.module:71 +msgid "More information is available in the XML Sitemap documentation." msgstr "" -#: xmlsitemap/xmlsitemap.admin.inc:206 -msgid "Settings" +#: xmlsitemap.module:206 +msgid "General settings" msgstr "" -#: xmlsitemap/xmlsitemap.admin.inc:212 -msgid "Add all the links to the default language sitemap" +#: xmlsitemap.module:212 +msgid "Add all the links to the default language site map" msgstr "" -#: xmlsitemap/xmlsitemap.admin.inc:214 +#: xmlsitemap.module:214 msgid "This option will be used only when the language negotiation uses a path prefix mechanism." msgstr "" -#: xmlsitemap/xmlsitemap.admin.inc:218 -msgid "Cron limit" +#: xmlsitemap.module:218 +msgid "Front page change frequency" msgstr "" -#: xmlsitemap/xmlsitemap.admin.inc:219 -msgid "The number of links that are updated in each pass of a cron maintenance task. Choosing a number too high could cause the other modules cron tasks to not be executed; use the higher numbers only when you are sure it will not cause any problems on your Drupal installation." +#: xmlsitemap.module:219 +msgid "The change frequency associated with the front page." msgstr "" -#: xmlsitemap/xmlsitemap.admin.inc:225 +#: xmlsitemap.module:231 msgid "Cache directory" msgstr "" -#: xmlsitemap/xmlsitemap.admin.inc:229 +#: xmlsitemap.module:235 msgid "The directory where the cache files are created; change it only if you are having problems with the default setting." msgstr "" -#: xmlsitemap/xmlsitemap.admin.inc:233 -msgid "Front page" +#: xmlsitemap.module:239 +msgid "Priority" msgstr "" -#: xmlsitemap/xmlsitemap.admin.inc:238 -msgid "Front page change frequency" -msgstr "" - -#: xmlsitemap/xmlsitemap.admin.inc:239 -msgid "The change frequency associated with the front page." -msgstr "" - -#: xmlsitemap/xmlsitemap.admin.inc:251 +#: xmlsitemap.module:247 msgid "Front page priority" msgstr "" -#: xmlsitemap/xmlsitemap.admin.inc:252 +#: xmlsitemap.module:248 msgid "The absolute priority for the front page." msgstr "" -#: xmlsitemap/xmlsitemap.admin.inc:285 -msgid "Update the cache files" -msgstr "" - -#: xmlsitemap/xmlsitemap.admin.inc:290 -msgid "Update cache" -msgstr "" - -#: xmlsitemap/xmlsitemap.admin.inc:315 -msgid "Updating the cache files" -msgstr "" - -#: xmlsitemap/xmlsitemap.admin.inc:379 -msgid "No additional links have been created." -msgstr "" - -#: xmlsitemap/xmlsitemap.admin.inc:384 -msgid "Path" +#: xmlsitemap.module:283 +msgid "The update has been performed." msgstr "" -#: xmlsitemap/xmlsitemap.admin.inc:387 -msgid "Operations" +#: xmlsitemap.module:286 +msgid "An error occurred and processing did not complete." msgstr "" -#: xmlsitemap/xmlsitemap.admin.inc:409 -msgid "Updating %module cache files (@count links of @max)." +#: xmlsitemap.module:289 +msgid "Last items successfully processed:" msgstr "" -#: xmlsitemap/xmlsitemap.admin.inc:428 -msgid "The cache files have been updated." -msgstr "" - -#: xmlsitemap/xmlsitemap.admin.inc:431 -msgid "The cache file have not been sucessfully updated." -msgstr "" - -#: xmlsitemap/xmlsitemap.module:62 -msgid "The sitemap is located at @sitemap." -msgstr "" - -#: xmlsitemap/xmlsitemap.module:65 -msgid "XML sitemap automatically creates a sitemap that conforms to the sitemaps.org specification. This helps search engines keep their search results up to date." -msgstr "" - -#: xmlsitemap/xmlsitemap.module:66 -msgid "Supporting modules" -msgstr "" - -#: xmlsitemap/xmlsitemap.module:67 -msgid "By itself, the XML sitemap module adds only the front page of your site to the sitemap. Other types of links are handled by supporting modules." -msgstr "" - -#: xmlsitemap/xmlsitemap.module:78 -msgid "Links may be assigned a priority between 0.0 and 1.0. The default priority is 0.5. A priority of Not in sitemap excludes a link from the sitemap." -msgstr "" - -#: xmlsitemap/xmlsitemap.module:79 -msgid "More information is available in the XML sitemap documentation." -msgstr "" - -#: xmlsitemap/xmlsitemap.module:416 +#: xmlsitemap.module:343 msgid "1.0" msgstr "" -#: xmlsitemap/xmlsitemap.module:417 +#: xmlsitemap.module:344 msgid "0.9" msgstr "" -#: xmlsitemap/xmlsitemap.module:418 +#: xmlsitemap.module:345 msgid "0.8" msgstr "" -#: xmlsitemap/xmlsitemap.module:419 +#: xmlsitemap.module:346 msgid "0.7" msgstr "" -#: xmlsitemap/xmlsitemap.module:420 +#: xmlsitemap.module:347 msgid "0.6" msgstr "" -#: xmlsitemap/xmlsitemap.module:421 +#: xmlsitemap.module:348 msgid "0.5" msgstr "" -#: xmlsitemap/xmlsitemap.module:422 +#: xmlsitemap.module:349 msgid "0.4" msgstr "" -#: xmlsitemap/xmlsitemap.module:423 +#: xmlsitemap.module:350 msgid "0.3" msgstr "" -#: xmlsitemap/xmlsitemap.module:424 +#: xmlsitemap.module:351 msgid "0.2" msgstr "" -#: xmlsitemap/xmlsitemap.module:425 +#: xmlsitemap.module:352 msgid "0.1" msgstr "" -#: xmlsitemap/xmlsitemap.module:426 +#: xmlsitemap.module:353 msgid "0.0" msgstr "" -#: xmlsitemap/xmlsitemap.module:429 -msgid "Not in sitemap" +#: xmlsitemap.module:356 +msgid "Not in site map" msgstr "" -#: xmlsitemap/xmlsitemap.module:432 +#: xmlsitemap.module:359 msgid "Default" msgstr "" -#: xmlsitemap/xmlsitemap.module:475;96 xmlsitemap/xmlsitemap.info:0;0 xmlsitemap_engines/xmlsitemap_engines.info:0 xmlsitemap_node/xmlsitemap_node.module:52;80 xmlsitemap_node/xmlsitemap_node.info:0 xmlsitemap_taxonomy/xmlsitemap_taxonomy.module:48;70 xmlsitemap_taxonomy/xmlsitemap_taxonomy.info:0 xmlsitemap_user/xmlsitemap_user.module:47;74 xmlsitemap_user/xmlsitemap_user.info:0 -msgid "XML sitemap" +#: xmlsitemap.module:432 +msgid "XML site map" msgstr "" -#: xmlsitemap/xmlsitemap.module:609 -msgid "Cache files building task exceeded the time limit and was aborted." +#: xmlsitemap.module:566;572;594;605;0 +msgid "xmlsitemap" msgstr "" -#: xmlsitemap/xmlsitemap.module:620 -msgid "The cache files building task has been running for more than an hour and is most likely stuck." +#: xmlsitemap.module:566 +msgid "Could not create the cache files directory (@directory)" msgstr "" -#: xmlsitemap/xmlsitemap.module:182 -msgid "override node settings" +#: xmlsitemap.module:572;594;605 +msgid "Cannot create the cache file (@file)" msgstr "" -#: xmlsitemap/xmlsitemap.module:182 -msgid "override profile settings" -msgstr "" - -#: xmlsitemap/xmlsitemap.module:97;105 -msgid "Configure the XML sitemap." -msgstr "" +#: xmlsitemap.module:287 +msgid "1 item successfully processed." +msgid_plural "@count items successfully processed." +msgstr[0] "" +msgstr[1] "" -#: xmlsitemap/xmlsitemap.module:104 -msgid "Sitemap" +#: xmlsitemap.module:126 +msgid "by-pass the authored nodes check" msgstr "" -#: xmlsitemap/xmlsitemap.module:111 -msgid "Additional links" -msgstr "" - -#: xmlsitemap/xmlsitemap.module:119 -msgid "List" +#: xmlsitemap.module:126 +msgid "override node settings" msgstr "" -#: xmlsitemap/xmlsitemap.module:124 -msgid "Add link" +#: xmlsitemap.module:126 +msgid "override profile settings" msgstr "" -#: xmlsitemap/xmlsitemap.module:132 -msgid "Tools" +#: xmlsitemap.module:87 xmlsitemap.install:20 xmlsitemap.info:0;0 +msgid "XML Sitemap" msgstr "" -#: xmlsitemap/xmlsitemap.module:149 -msgid "Edit link" +#: xmlsitemap.module:88;95 +msgid "Configure the XML site map." msgstr "" -#: xmlsitemap/xmlsitemap.module:158 -msgid "Sitemap index" +#: xmlsitemap.module:94 +msgid "Site map" msgstr "" -#: xmlsitemap/xmlsitemap.module:166 -msgid "Sitemap !number" +#: xmlsitemap.module:100 +msgid "Site map index" msgstr "" -#: xmlsitemap/xmlsitemap.install:214 -msgid "XML sitemap term has been deprecated in favor of XML sitemap taxonomy; enable it in the modules page." +#: xmlsitemap.module:110 +msgid "Site map !number" msgstr "" -#: xmlsitemap/xmlsitemap.install:263 -msgid "XML sitemap menu has been deprecated, and it is not anymore included in XML sitemap. It seems you have not correctly copied the new files, or you have two different sets of files in two different directories. Verify that you correctly copied the new files, before to proceed." +#: xmlsitemap.install:21 +msgid "!module_file/!module_revision !install_file/!install_revision" msgstr "" -#: xmlsitemap/xmlsitemap.info:0 -msgid "Create a XML sitemap conforming to sitemaps.org specifications." +#: xmlsitemap.info:0 +msgid "Creates an XML site map in accordance with sitemaps.org specifications." msgstr "" diff -upNr -x CVS -x CHANGELOG.txt -x '.#*' -I '.*\$Id.*' xmlsitemap-DRUPAL-6--1/xmlsitemap/xmlsitemap.admin.inc xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap/xmlsitemap.admin.inc --- xmlsitemap-DRUPAL-6--1/xmlsitemap/xmlsitemap.admin.inc 2009-05-26 22:49:10 -0400 +++ xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap/xmlsitemap.admin.inc 2009-05-07 08:59:31 -0400 @@ -16,188 +16,6 @@ ****************************************************************************/ /** - * Form builder; return the additional links form. - */ -function xmlsitemap_additional_links() { - $form = array('#tree' => TRUE); - $links = _xmlsitemap_additional_links_list(); - foreach ($links as $id => $link) { - $form[$id]['#link'] = (array)$link; - $form[$id]['pdata'] = array( - '#value' => check_plain(truncate_utf8($link->pdata, 40, FALSE, TRUE)) - ); - $form[$id]['status'] = array( - '#type' => 'checkbox', - '#default_value' => $link->status, - ); - $form[$id]['priority'] = array( - '#type' => 'select', - '#default_value' => $link->priority, - '#options' => xmlsitemap_priority_options(), - ); - $form[$id]['edit'] = array( - '#value' => l(t('edit'), "admin/settings/xmlsitemap/additional/edit/{$id}") - ); - $form[$id]['delete'] = array( - '#value' => l(t('delete'), "admin/settings/xmlsitemap/additional/delete/{$id}") - ); - } - if (count($links)) { - $form['submit'] = array( - '#type' => 'submit', - '#value' => t('Save') - ); - } - return $form; -} - -/** - * Submit function for the additional links list. - */ -function xmlsitemap_additional_links_submit($form, &$form_state) { - $saved = TRUE; - foreach ($form_state['values'] as $id => $link) { - if (is_numeric($id) && ($form[$id]['#link']['status'] != $form_state['values'][$id]['status'] || $form[$id]['#link']['priority'] != $form_state['values'][$id]['priority'])) { - $form[$id]['#link']['status'] = $form_state['values'][$id]['status']; - $form[$id]['#link']['priority'] = $form_state['values'][$id]['priority']; - $row = (object)(array() + $form[$id]['#link']); - $row->changed = REQUEST_TIME; - $saved = $saved && xmlsitemap_write_link($row, 'xmlsitemap_additional', 'xmlsitemap'); - } - } - if (!$saved) { - drupal_set_message(t('An error occurred while saving the links.'), 'error'); - } - else { - drupal_set_message(t('The links have been saved.')); - } -} - -/** - * Form builder; display the form to edit the additional links. - */ -function xmlsitemap_additional_links_edit($form_state, $link = NULL) { - if (!isset($link)) { - $link = (object) array( - 'pdata' => '', - 'status' => TRUE, - 'priority' => 0.5, - ); - } - else { - $form['#mid'] = $link->mid; - } - $form['pdata'] = array( - '#type' => 'textfield', - '#title' => t('Relative path'), - '#description' => t('The path must be relative to the Drupal installation directory, and accessible from the anonymous user. If the path is a path alias, the original path will be used.'), - '#default_value' => $link->pdata, - '#size' => 40, - '#maxlength' => 128, - '#required' => TRUE, - ); - $form['status'] = array( - '#type' => 'checkbox', - '#title' => t('Enabled'), - '#default_value' => $link->status, - '#description' => t('If selected, the link will appear in the sitemap.'), - ); - $form['priority'] = array( - '#type' => 'select', - '#title' => t('Priority'), - '#default_value' => $link->priority, - '#options' => xmlsitemap_priority_options(), - '#description' => t('The priority of a link determines its position in the sitemap; the links with a higher priority will appear first in the sitemap.'), - ); - $form['save'] = array( - '#type' => 'submit', - '#value' => t('Save'), - '#weight' => 10, - ); - return $form; -} - -/** - * Validate function for the edit form. - */ -function xmlsitemap_additional_links_edit_validate($form, &$form_state) { - global $user; - $path = drupal_get_normal_path($form_state['values']['path']); - // Set the current user to the anonymous user to verify the links being - // added are accessible from the anonymous user. - session_save_session(FALSE); - $original_user = $user; - $user = drupal_anonymous_user(); - $menu = menu_get_item($path); - // Set the current user to the original value. - $user = $original_user; - session_save_session(TRUE); - if (!$menu || empty($menu['access'])) { - form_set_error('path', t('The path is either invalid or is not accessible from the anonymous user.')); - return; - } - $mid = db_result(db_query("SELECT mid from {xmlsitemap_additional} WHERE pdata = '%s'", $path)); - if ($mid !== FALSE) { - $error = t('The path has been already used.'); - if (isset($form['#mid'])) { - if ($form['#mid'] != $mid) { - form_set_error('path', $error); - } - } - else { - form_set_error('path', $error); - } - } - else { - form_set_value($form['path'], $path, $form_state); - } -} - -/** - * Submit function for the edit form. - */ -function xmlsitemap_additional_links_edit_submit($form, &$form_state) { - $form_state['values']['mid'] = $form['#mid']; - $link = (object) (array() + $form_state['values']); - if ($rc = xmlsitemap_write_link($link, 'xmlsitemap_additional', 'xmlsitemap')) { - drupal_set_message(t('The link %link has been updated.', array('%link' => $link->pdata))); - watchdog('xmlsitemap', 'The link %link has been updated.', array('%link' => $link->pdata)); - } - if (!rc) { - drupal_set_message(t('An error occurred while saving the link %link.', array('%link' => $link->pdata)), 'error'); - watchdog('xmlsitemap', 'An error occurred while saving the link %link.', array('%link' => $link->pdata), WATCHDOG_ERROR); - } - $form_state['redirect'] = 'admin/settings/xmlsitemap/additional/list'; -} - -/** - * Form builder; display the form to delete an additional link. - */ -function xmlsitemap_additional_links_delete_confirm($form_state, $link) { - $form['#link'] = $link; - return confirm_form($form, - t('Are you sure you want to delete the link?'), - isset($_GET['destination']) ? $_GET['destination'] : 'admin/settings/xmlsitemap/additional/list', - t('This action cannot be undone.'), - t('Delete'), - t('Cancel') - ); -} - -/** - * Submission function for the delete form. - */ -function xmlsitemap_additional_links_delete_confirm_submit($form, &$form_state) { - if ($form_state['values']['confirm']) { - $link = $form['#link']; - db_query('DELETE FROM {xmlsitemap_additional} WHERE mid = %d', $link->mid); - drupal_set_message(t('The link %link has been deleted.', array('%link' => $link->pdata))); - } - - $form_state['redirect'] = 'admin/settings/xmlsitemap/additional/list'; -} - -/** * Form builder; return the sitemap settings form. */ function xmlsitemap_settings() { @@ -216,9 +34,9 @@ function xmlsitemap_settings() { $form['general']['xmlsitemap_cron_limit'] = array( '#type' => 'select', '#title' => t('Cron limit'), - '#description' => t('The number of links that are updated in each pass of a cron maintenance task. Choosing a number too high could cause the other modules cron tasks to not be executed; use the higher numbers only when you are sure it will not cause any problems on your Drupal installation.', array('@cron' => url('admin/reports/status'))), - '#default_value' => variable_get('xmlsitemap_cron_limit', 200), - '#options' => drupal_map_assoc(array(2, 10, 50, 100, 200, 300, 400, 500, 1000, 1500, 2000, 2500, 3000, 3500, 4000, 4500, 5000)), + '#description' => t('The number of links that are updated in each pass of a cron maintenance task.', array('@cron' => url('admin/reports/status'))), + '#default_value' => variable_get('xmlsitemap_cron_limit', 100), + '#options' => xmlsitemap_cron_options(), ); $form['general']['xmlsitemap_cache_directory'] = array( '#type' => 'textfield', @@ -239,18 +57,18 @@ function xmlsitemap_settings() { '#description' => t('The change frequency associated with the front page.'), '#default_value' => variable_get('xmlsitemap_front_page_changefreq', 3600), '#options' => array( - '3600' => t('Hourly'), - '86400' => t('Daily'), - '604800' => t('Weekly'), - '2419200' => t('Monthly'), - '29030400' => t('Yearly'), + '3600' => 'Hourly', + '86400' => 'Daily', + '604800' => 'Weekly', + '2419200' => 'Monthly', + '29030400' => 'Yearly', ), ); $form['frontpage']['xmlsitemap_front_page_priority'] = array( '#type' => 'select', '#title' => t('Front page priority'), '#description' => t('The absolute priority for the front page.'), - '#default_value' => variable_get('xmlsitemap_front_page_priority', 1.0), + '#default_value' => variable_get('xmlsitemap_front_page_priority', 1), '#options' => xmlsitemap_priority_options(), ); $form = system_settings_form($form); @@ -273,163 +91,53 @@ function xmlsitemap_settings_validate($f * Submit the settings form. */ function xmlsitemap_settings_submit($form, &$form_state) { - xmlsitemap_flag_sitemap(TRUE); + xmlsitemap_flag_sitemap(); } /** * Form builder; return the tools form. */ function xmlsitemap_tools() { - $form['xmlsitemap_update_cache_files'] = array( + $form['options'] = array( '#type' => 'fieldset', - '#title' => t('Update the cache files'), - '#collapsible' => TRUE, + '#title' => t('Operations'), + '#collapsible' => FALSE, + '#collapsed' => FALSE, + '#prefix' => '
', + '#suffix' => '
', + ); + $options = array(); + foreach (module_invoke_all('xmlsitemap_operations') as $operation => $info) { + $options[$operation] = $info['label']; + } + reset($options); + $form['options']['operation'] = array( + '#type' => 'select', + '#options' => $options, + '#default_value' => key($options), ); - $form['xmlsitemap_update_cache_files']['update_cache'] = array( + $form['options']['submit'] = array( '#type' => 'submit', - '#value' => t('Update cache'), - '#submit' => array('xmlsitemap_update_cache_files_submit'), + '#value' => t('Apply'), + '#submit' => array('xmlsitemap_tools_submit'), ); return $form; } /** - * Submit function for the 'Update the sitemap cache files' operation. + * Submit the tools form. */ -function xmlsitemap_update_cache_files_submit($form, &$form_state) { - // Try to increase the maximum execution time if it is too low. - if (ini_get('max_execution_time') < 240) { - @set_time_limit(240); - } - // Fetch the cron semaphore - if (!_xmlsitemap_cron_semaphore() && xmlsitemap_chunk_count(TRUE)) { - // Register shutdown callback - variable_set('xmlsitemap_cron_semaphore', REQUEST_TIME); - register_shutdown_function('_xmlsitemap_cron_cleanup'); - // Lock cron semaphore - // Update the information about the sitemap chunks. - // Build the cache files for the sitemap chunks. - $batch = array( - 'operations' => array(), - 'finished' => '_xmlsitemap_update_cache_batch_finished', - 'title' => t('Updating the cache files'), - 'file' => drupal_get_path('module', 'xmlsitemap') . '/xmlsitemap.admin.inc', - ); - $batch_count = 0; - $chunk_size = variable_get('xmlsitemap_chunk_size', 1000); - $chunks_info = variable_get('xmlsitemap_sitemap_chunks_info', array()); - $md5 = substr(md5($base_url), 0, 8); - $parent_dir = variable_get('xmlsitemap_cache_directory', file_directory_path() .'/xmlsitemap'); - foreach($chunks_info as $module => $info) { - $first_chunk = $info['first chunk']; - // if first chunk is less than zero, the module is not enabled. - if ($first_chunk < 0 || $info['chunks'] == 0) { - continue; - } - if ($info['needs update']) { - for ($chunk = $first_chunk; $chunk <= $first_chunk + $info['chunks'] - 1; $chunk++) { - $delta = $chunk - $first_chunk; - $from = $delta * $chunk_size; - $count = min($info['links'] - $from, $chunk_size); - $filename = $parent_dir .'/'. $md5 . $info['id'] . $delta . $language->language .'.xml'; - if ($fp = @fopen($filename, 'wb+')) { - $batch['operations'][] = array('_xmlsitemap_update_cache_batch', array($module, $filename, $from, $count)); - $batch_count++; - fclose($fp); - } - } - } - $chunks_info[$module]['needs update'] = FALSE; - } - variable_set('xmlsitemap_sitemap_chunks_info', $chunks_info); - if ($batch_count) { - batch_set($batch); - } - else { - - variable_del('xmlsitemap_cron_semaphore'); - } - } -} - -/***************************************************************************** - * Theme functions. - ****************************************************************************/ - -function theme_xmlsitemap_additional_links($form) { - $rows = array(); - foreach (element_children($form) as $key) { - if (isset($form[$key]['pdata'])) { - $link = &$form[$key]; - $row = array(); - $row[] = drupal_render($link['pdata']); - $row[] = drupal_render($link['status']); - $row[] = drupal_render($link['priority']); - $row[] = drupal_render($link['edit']); - $row[] = drupal_render($link['delete']); - - $rows[] = array( - 'data' => $row, - ); - } - } - if (empty($rows)) { - $rows[] = array( - array( - 'data' => t('No additional links have been created.'), - 'colspan' => '5' - ) - ); - } - $header[] = t('Path'); - $header[] = t('Enabled'); - $header[] = t('Priority'); - $header[] = array('data' => t('Operations'), 'colspan' => '2'); - return theme('table', $header, $rows) . drupal_render($form); -} - -/***************************************************************************** - * Private functions - batch operations. - ****************************************************************************/ - -function _xmlsitemap_update_cache_batch($module, $filename, $from, $count, &$context) { - if (!isset($context['sandbox']['progress'])) { - $context['sandbox']['fp'] = @fopen($filename, 'wb+'); - $context['sandbox']['max'] = $count; - $context['sandbox']['progress'] = 0; - } - if ($fp = $context['sandbox']['fp']) { - if (!$context['sandbox']['progress']) { - fwrite($fp, ''."\n"); - fwrite($fp, ''."\n"); - } - $step = min($count - $context['sandbox']['progress'], 10); - module_invoke($module, 'xmlsitemap_links', $fp, $from + $context['sandbox']['progress'], $step); - $context['sandbox']['progress'] += $step; - $context['message'] = t('Updating %module cache files (@count links of @max).', array('%module' => $module, '@count' => $context['sandbox']['progress'], '@max' => $count)); - if ($context['sandbox']['progress'] != $context['sandbox']['max']) { - $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max']; - } - else { - fwrite($fp, ''); - fclose($fp); - $context['sandbox']['fp'] = 0; - } - } -} - -/***************************************************************************** - * Private functions. - ****************************************************************************/ - -function _xmlsitemap_update_cache_batch_finished($success, $results, $operations) { - variable_del('xmlsitemap_cron_semaphore'); - if ($success) { - drupal_set_message(t('The cache files have been updated.')); +function xmlsitemap_tools_submit($form, &$form_state) { + $operations = module_invoke_all('xmlsitemap_operations'); + $operation = $operations[$form_state['values']['operation']]; + $function = $operation['callback']; + if (isset($operation['callback arguments'])) { + call_user_func_array($function, $operation['callback arguments']); } else { - drupal_set_message(t('The cache file have not been sucessfully updated.'), 'error'); + call_user_func($function, NULL); } + $form_state['redirect'] = 'admin/settings/xmlsitemap/tools'; } /** diff -upNr -x CVS -x CHANGELOG.txt -x '.#*' -I '.*\$Id.*' xmlsitemap-DRUPAL-6--1/xmlsitemap/xmlsitemap.cron.php xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap/xmlsitemap.cron.php --- xmlsitemap-DRUPAL-6--1/xmlsitemap/xmlsitemap.cron.php 2009-05-25 18:41:55 -0400 +++ xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap/xmlsitemap.cron.php 1969-12-31 19:00:00 -0500 @@ -1,85 +0,0 @@ - 3600) { - // Either the task has been running for more than an hour or the semaphore - // was not reset due to a database error. - watchdog('xmlsitemap', 'Cache files building task has been running for more than an hour and is most likely stuck.', array(), WATCHDOG_ERROR); - - // Release cron semaphore - variable_del('xmlsitemap_cron_semaphore'); - } - else { - // The task is still running normally. - watchdog('xmlsitemap', 'Attempting to re-run the cache files building task while it is already running.', array(), WATCHDOG_WARNING); - } -} -else { - // Register shutdown callback - register_shutdown_function('_xmlsitemap_cron_cleanup'); - - // Lock cron semaphore - variable_set('xmlsitemap_cron_semaphore', REQUEST_TIME); - - // Update the information about the sitemap chunks. - xmlsitemap_chunk_count(TRUE); - - // Build the cache files for the sitemap chunks. - $chunks_info = variable_get('xmlsitemap_sitemap_chunks_info', array()); - $md5 = substr(md5($base_url), 0, 8); - $parent_dir = variable_get('xmlsitemap_cache_directory', file_directory_path() .'/xmlsitemap'); - foreach($chunks_info as $module => $info) { - $first_chunk = $info['first chunk']; - // if first chunk is less than zero, the module is not enabled. - if ($first_chunk < 0 || $info['chunks'] == 0) { - continue; - } - - if ($info['needs update']) { - for ($chunk = $first_chunk; $chunk <= $first_chunk + $info['chunks'] - 1; $chunk++) { - $chunk_size = variable_get('xmlsitemap_chunk_size', 1000); - $delta = $chunk - $first_chunk; - $from = $delta * $chunk_size; - $count = min($info['links'] - $from, $chunk_size); - $filename = $parent_dir .'/'. $md5 . $info['id'] . $delta . $language->language .'.xml'; - if ($fp = @fopen($filename, 'wb+')) { - fwrite($fp, ''."\n"); - fwrite($fp, ''."\n"); - module_invoke($module, 'xmlsitemap_links', $fp, $from, $count); - fwrite($fp, ''); - fclose($fp); - } - } - $chunks_info[$module]['needs update'] = FALSE; - variable_set('xmlsitemap_sitemap_chunks_info', $chunks_info); - } - - // Release cron semaphore - variable_del('xmlsitemap_cron_semaphore'); - } -} diff -upNr -x CVS -x CHANGELOG.txt -x '.#*' -I '.*\$Id.*' xmlsitemap-DRUPAL-6--1/xmlsitemap/xmlsitemap.install xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap/xmlsitemap.install --- xmlsitemap-DRUPAL-6--1/xmlsitemap/xmlsitemap.install 2009-05-26 22:49:10 -0400 +++ xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap/xmlsitemap.install 2009-05-07 08:59:31 -0400 @@ -15,6 +15,13 @@ */ function xmlsitemap_requirements($phase) { $requirements = array(); + if ($phase == 'runtime') { + $requirements['xmlsitemap'] = array( + 'title' => t('XML sitemap'), + 'value' => t("!module_file/!module_revision !install_file/!install_revision", array('!module_file' => 'xmlsitemap.module', '!module_revision' =>_xmlsitemap_revision(), '!install_file' => 'xmlsitemap.install', '!install_revision' => preg_replace('/\$Rev[iI]sion:\s+(.*)\s+\$/iU', '$1', '$Revision: 1.1.2.54 $'))), + 'severity' => REQUIREMENT_OK, + ); + } return $requirements; } @@ -22,34 +29,56 @@ function xmlsitemap_requirements($phase) * Implementation of hook_schema(). */ function xmlsitemap_schema() { - $schema['xmlsitemap_additional'] = array( - 'description' => 'The list of additional links added to the sitemap.', + $schema['xmlsitemap'] = array( + 'description' => 'The base table for xmlsitemap.', 'fields' => array( - 'mid' => array( + 'lid' => array( 'description' => 'The primary key.', 'type' => 'serial', 'not null' => TRUE, ), - 'pdata' => array( - 'description' => 'The relative path of the link.', + 'loc' => array( + 'description' => 'The relative URL.', + 'type' => 'varchar', + 'length' => 255, + 'not null' => TRUE, + 'default' => '', + ), + 'module' => array( + 'description' => 'The module handling this link.', + 'type' => 'varchar', + 'length' => 255, + 'not null' => TRUE, + 'default' => '', + ), + 'type' => array( + 'description' => 'The type of link.', 'type' => 'varchar', - 'length' => 128, + 'length' => 32, 'not null' => TRUE, 'default' => '', ), - 'status' => array( - 'description' => 'Boolean indicating whether or not this link is enabled.', + 'id' => array( + 'description' => 'The ID associated with the link.', 'type' => 'int', + 'unsigned' => TRUE, 'not null' => TRUE, - 'default' => 1, + 'default' => 0, ), - 'previously_changed' => array( - 'description' => 'The Unix timestamp of the previous change.', + 'sid' => array( + 'description' => 'The sub ID associated with the link.', 'type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0, ), + 'language' => array( + 'description' => 'The language associated with the link.', + 'type' => 'varchar', + 'length' => 12, + 'not null' => TRUE, + 'default' => '', + ), 'changed' => array( 'description' => 'The Unix timestamp of the last change.', 'type' => 'int', @@ -57,22 +86,27 @@ function xmlsitemap_schema() { 'not null' => TRUE, 'default' => 0, ), + 'changefreq' => array( + 'description' => 'The frequency of the changes.', + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ), 'priority' => array( - 'description' => 'The priority of the node in the sitemap.', + 'description' => 'The priority of this node in the sitemap.', 'type' => 'float', 'not null' => TRUE, 'default' => 0.5, ), ), 'indexes' => array( - 'link_status' => array('status'), + 'link_module' => array(array('module', 25)), + 'link_language' => array('language'), 'link_changed' => array('changed'), 'link_priority' => array('priority'), ), - 'unique keys' => array( - 'link_pdata' => array('pdata'), - ), - 'primary key' => array('mid'), + 'primary key' => array('lid'), ); return $schema; } @@ -92,38 +126,282 @@ function xmlsitemap_install() { function xmlsitemap_update_6000() { $ret = array(); if ($GLOBALS['db_type'] == 'pgsql') { + $ret[] = update_sql('DROP FUNCTION IF EXISTS first(anyelement, anyelement);'); $result = @update_sql("DROP AGGREGATE first(anyelement)"); if ($result['success']) { $ret[] = $result; } - $result = @update_sql('DROP FUNCTION IF EXISTS first(anyelement, anyelement);'); - if ($result['success']) { - $ret[] = $result; - } } if (db_table_exists('xmlsitemap_additional')) { db_drop_table($ret, 'xmlsitemap_additional'); } if (db_table_exists('xmlsitemap')) { - db_drop_table($ret, 'xmlsitemap'); + $result = array(); + @db_drop_primary_key($result, 'xmlsitemap'); + if ($result[0]['success']) { + $ret[] = $result[0]; + } + $result = array(); + @db_drop_index($result, 'xmlsitemap', 'link_module'); + if ($result[0]['success']) { + $ret[] = $result[0]; + } + $result = array(); + @db_drop_index($result, 'xmlsitemap', 'link_type'); + if ($result[0]['success']) { + $ret[] = $result[0]; + } + $result = array(); + @db_drop_index($result, 'xmlsitemap', 'link_changed'); + if ($result[0]['success']) { + $ret[] = $result[0]; + } + $result = array(); + @db_drop_index($result, 'xmlsitemap', 'link_priority'); + if ($result[0]['success']) { + $ret[] = $result[0]; + } + if (!db_column_exists('xmlsitemap', 'lid')) { + db_add_field($ret, 'xmlsitemap', 'lid', + array( + 'description' => 'The primary key.', + 'type' => 'serial', + 'not null' => TRUE, + ), + array('primary key' => array('lid')) + ); + } + db_change_field($ret, 'xmlsitemap', 'loc', 'loc', + array( + 'description' => 'The relative URL.', + 'type' => 'varchar', + 'length' => 255, + 'not null' => TRUE, + 'default' => '', + ) + ); + if (db_column_exists('xmlsitemap', 'module')) { + db_change_field($ret, 'xmlsitemap', 'module', 'module', + array( + 'description' => 'The module handling this link.', + 'type' => 'varchar', + 'length' => 255, + 'not null' => TRUE, + 'default' => '', + ), + array('indexes' => array('link_module' => array(array('module', 25)))) + ); + } + else { + db_add_field($ret, 'xmlsitemap', 'module', + array( + 'description' => 'The module handling this link.', + 'type' => 'varchar', + 'length' => 255, + 'not null' => TRUE, + 'default' => '', + ), + array('indexes' => array('link_module' => array(array('module', 25)))) + ); + } + if (db_column_exists('xmlsitemap', 'type')) { + db_change_field($ret, 'xmlsitemap', 'type', 'type', + array( + 'description' => 'The type of link.', + 'type' => 'varchar', + 'length' => 32, + 'not null' => TRUE, + 'default' => '', + ) + ); + } + else { + db_add_field($ret, 'xmlsitemap', 'type', + array( + 'description' => 'The type of link.', + 'type' => 'varchar', + 'length' => 32, + 'not null' => TRUE, + 'default' => '', + ) + ); + } + if (!db_column_exists('xmlsitemap', 'id')) { + db_add_field($ret, 'xmlsitemap', 'id', + array( + 'description' => 'The ID associated with the link.', + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ) + ); + } + if (!db_column_exists('xmlsitemap', 'sid')) { + db_add_field($ret, 'xmlsitemap', 'sid', + array( + 'description' => 'The sub ID associated with the link.', + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ) + ); + } + if (!db_column_exists('xmlsitemap', 'language')) { + db_add_field($ret, 'xmlsitemap', 'language', + array( + 'description' => 'The language associated with the link.', + 'type' => 'varchar', + 'length' => 12, + 'not null' => TRUE, + 'default' => '', + ), + array('indexes' => array('link_language' => array('language'))) + ); + } + if (db_column_exists('xmlsitemap', 'lastmod')) { + db_change_field($ret, 'xmlsitemap', 'lastmod', 'changed', + array( + 'description' => 'The Unix timestamp of the last change.', + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ), + array('indexes' => array('link_changed' => array('changed'))) + ); + } + else { + if (!db_column_exists('xmlsitemap', 'changed')) { + db_add_field($ret, 'xmlsitemap', 'changed', + array( + 'description' => 'The Unix timestamp of the last change.', + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ), + array('indexes' => array('link_changed' => array('changed'))) + ); + } + } + if (db_column_exists('xmlsitemap', 'changefreq')) { + db_change_field($ret, 'xmlsitemap', 'changefreq', 'changefreq', + array( + 'description' => 'The frequency of the changes.', + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ) + ); + } + if (db_column_exists('xmlsitemap', 'priority')) { + db_change_field($ret, 'xmlsitemap', 'priority', 'priority', + array( + 'description' => 'The priority of this node in the sitemap.', + 'type' => 'float', + 'not null' => TRUE, + 'default' => 0.5, + ), + array('indexes' => array('link_priority' => array('priority'))) + ); + } } - foreach(xmlsitemap_schema() as $table => $definition) { - db_create_table($ret, $table, $definition); + else { + db_create_table($ret, 'xmlsitemap', + array( + 'description' => 'The base table for xmlsitemap.', + 'fields' => array( + 'lid' => array( + 'description' => 'The primary key.', + 'type' => 'serial', + 'not null' => TRUE, + ), + 'loc' => array( + 'description' => 'The relative URL.', + 'type' => 'varchar', + 'length' => 255, + 'not null' => TRUE, + 'default' => '', + ), + 'module' => array( + 'description' => 'The module handling this link.', + 'type' => 'varchar', + 'length' => 255, + 'not null' => TRUE, + 'default' => '', + ), + 'type' => array( + 'description' => 'The type of link.', + 'type' => 'varchar', + 'length' => 32, + 'not null' => TRUE, + 'default' => '', + ), + 'id' => array( + 'description' => 'The ID associated with the link.', + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ), + 'sid' => array( + 'description' => 'The sub ID associated with the link.', + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ), + 'language' => array( + 'description' => 'The language associated with the link.', + 'type' => 'varchar', + 'length' => 12, + 'not null' => TRUE, + 'default' => '', + ), + 'changed' => array( + 'description' => 'The Unix timestamp of the last change.', + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ), + 'changefreq' => array( + 'description' => 'The frequency of the changes.', + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ), + 'priority' => array( + 'description' => 'The priority of this node in the sitemap.', + 'type' => 'float', + 'not null' => TRUE, + 'default' => 0.5, + ), + ), + 'indexes' => array( + 'link_module' => array(array('module', 25)), + 'link_language' => array('language'), + 'link_changed' => array('changed'), + 'link_priority' => array('priority'), + ), + 'primary key' => array('lid'), + ) + ); } - $modules = array( - 'xmlsitemap_file', - 'xmlsitemap_helper', - 'xmlsitemap_menu', - 'xmlsitemap_term', - ); - module_disable($modules); - $ret[] = update_sql("DELETE FROM {system} WHERE name IN ('xmlsitemap_file', 'xmlsitemap_helper', 'xmlsitemap_menu', 'xmlsitemap_term') AND type = 'module'"); + if (module_exists('xmlsitemap_file')) { + module_disable(array('xmlsitemap_file')); + } + if (module_exists('xmlsitemap_helper')) { + module_disable(array('xmlsitemap_helper')); + } + $ret[] = update_sql("DELETE FROM {system} WHERE name IN ('xmlsitemap_file', 'xmlsitemap_helper') AND type = 'module'"); if (db_table_exists('xmlsitemap_file')) { db_drop_table($ret, 'xmlsitemap_file'); } - $ret[] = update_sql("DELETE FROM {menu_links} WHERE menu_name = 'menu-xmlsitemap'"); - $ret[] = update_sql("DELETE FROM {menu_custom} WHERE menu_name = 'menu-xmlsitemap'"); - $ret[] = update_sql("DELETE FROM {variable} WHERE name LIKE 'xmlsitemap\_menu\_%'"); if (!variable_get('menu_rebuild_needed', FALSE)) { variable_set('menu_rebuild_needed', TRUE); $ret[] = array( @@ -131,12 +409,143 @@ function xmlsitemap_update_6000() { 'query' => 'UPDATE MENU CALLBACKS', ); } + module_rebuild_cache(); + $ret[] = array( + 'success' => TRUE, + 'query' => 'UPDATE MODULES LIST', + ); return $ret; } /** * Implementation of hook_update_N(). */ +function xmlsitemap_update_6100() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_update_6101() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_update_6102() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_update_6103() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_update_6104() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_update_6105() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_update_6106() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_update_6107() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_update_6108() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_update_6109() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_update_6110() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_update_6111() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_update_6112() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_update_6113() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_update_6114() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_update_6115() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_update_6116() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_update_6117() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ function xmlsitemap_update_6118() { variable_set('xmlsitemap_cron_submit_frequency', variable_get('xmlsitemap_cron_submit', FALSE) ? 1 : -1); $ret[] = array( @@ -149,6 +558,55 @@ function xmlsitemap_update_6118() { /** * Implementation of hook_update_N(). */ +function xmlsitemap_update_6119() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_update_6120() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_update_6121() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_update_6122() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_update_6123() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_update_6124() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_update_6125() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ function xmlsitemap_update_6126() { $ret[] = update_sql("DELETE FROM {xmlsitemap}"); return $ret; @@ -157,7 +615,55 @@ function xmlsitemap_update_6126() { /** * Implementation of hook_update_N(). */ +function xmlsitemap_update_6127() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_update_6128() { +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_update_6129() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_update_6130() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_update_6131() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_update_6132() { + return xmlsitemap_update_6000(); +} + +/** + * Implementation of hook_update_N(). + */ function xmlsitemap_update_6133() { + if ($GLOBALS['db_type'] == 'pgsql') { + $ret[] = update_sql('DROP FUNCTION IF EXISTS first(anyelement, anyelement);'); + $result = @update_sql("DROP AGGREGATE first(anyelement)"); + if ($result['success']) { + $ret[] = $result; + } + } $ret[] = update_sql("UPDATE {system} SET weight = 5 WHERE name = 'xmlsitemap'"); return $ret; } @@ -165,8 +671,22 @@ function xmlsitemap_update_6133() { /** * Implementation of hook_update_N(). */ +function xmlsitemap_update_6134() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_update_6135() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ function xmlsitemap_update_6136() { - xmlsitemap_flag_sitemap(TRUE); + xmlsitemap_flag_sitemap(); $ret[] = array( 'success' => TRUE, 'query' => 'UPDATE SITEMAP', @@ -183,6 +703,13 @@ function xmlsitemap_update_6136() { /** * Implementation of hook_update_N(). */ +function xmlsitemap_update_6137() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ function xmlsitemap_update_6138() { $ret = array(); $result = array(); @@ -201,6 +728,11 @@ function xmlsitemap_update_6139() { if (db_table_exists('xmlsitemap_file')) { db_drop_table($ret, 'xmlsitemap_file'); } + module_rebuild_cache(); + $ret[] = array( + 'success' => TRUE, + 'query' => 'UPDATE MODULES LIST', + ); return $ret; } @@ -211,7 +743,7 @@ function xmlsitemap_update_6140() { $ret = array(); if (module_exists('xmlsitemap_term')) { module_disable(array('xmlsitemap_term')); - drupal_set_message(t('XML sitemap term has been deprecated in favor of XML sitemap taxonomy; enable it in the modules page.', array('@modules' => url('admin/build/modules')))); + drupal_set_message(t('XML sitemap term has been deprecated in favor of XML sitemap taxonomy; enable it in the modules page.', array('@modules' => url('admin/build/modules'))), 'status', FALSE); $ret[] = array( 'success' => TRUE, 'query' => 'DISABLE XMLSITEMAP_TERM', @@ -230,7 +762,7 @@ function xmlsitemap_update_6140() { /** * Implementation of hook_update_N(). */ -function xmlsitemap_update_6142() { +function xmlsitemap_update_6141() { $ret = array(); if (!variable_get('menu_rebuild_needed', FALSE)) { variable_set('menu_rebuild_needed', TRUE); @@ -243,64 +775,6 @@ function xmlsitemap_update_6142() { } /** - * Implementation of hook_update_N(). - */ -function xmlsitemap_update_6143() { - cache_clear_all(); - $ret[] = array( - 'success' => TRUE, - 'query' => 'UPDATE DRUPAL CACHE', - ); - return $ret; -} - -/** - * Implementation of hook_update_N(). - */ -function xmlsitemap_update_6145() { - if (module_exists('xmlsitemap_menu')) { - module_disable(array('xmlsitemap_menu')); - drupal_set_message(t('XML sitemap menu has been deprecated, and it is not anymore included in XML sitemap. It seems you have not correctly copied the new files, or you have two different sets of files in two different directories. Verify that you correctly copied the new files, before to proceed.'), 'error'); - $ret[] = array( - 'success' => TRUE, - 'query' => 'DISABLE XMLSITEMAP_MENU', - ); - } - $ret[] = update_sql("DELETE FROM {system} WHERE name = 'xmlsitemap_menu' AND type = 'module'"); - $ret[] = update_sql("DELETE FROM {menu_links} WHERE menu_name = 'menu-xmlsitemap'"); - $ret[] = update_sql("DELETE FROM {menu_custom} WHERE menu_name = 'menu-xmlsitemap'"); - $ret[] = update_sql("DELETE FROM {variable} WHERE name LIKE 'xmlsitemap\_menu\_%'"); - module_rebuild_cache(); - $ret[] = array( - 'success' => TRUE, - 'query' => 'UPDATE MODULES LIST', - ); - return $ret; -} - -/** - * Implementation of hook_update_N(). - */ -function xmlsitemap_update_6147() { - return xmlsitemap_update_6000(); -} - -/** - * Implementation of hook_update_N(). - */ -function xmlsitemap_update_6148() { - $ret = array(); - if (variable_get('xmlsitemap_cron_limit', -1) == -1) { - variable_set('xmlsitemap_cron_limit', 200); - $ret[] = array( - 'success' => TRUE, - 'query' => 'UPDATE MODULE SETTINGS', - ); - } - return $ret; -} - -/** * Implementation of hook_uninstall(). */ function xmlsitemap_uninstall() { diff -upNr -x CVS -x CHANGELOG.txt -x '.#*' -I '.*\$Id.*' xmlsitemap-DRUPAL-6--1/xmlsitemap/xmlsitemap.module xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap/xmlsitemap.module --- xmlsitemap-DRUPAL-6--1/xmlsitemap/xmlsitemap.module 2009-05-25 21:28:42 -0400 +++ xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap/xmlsitemap.module 2009-05-07 15:16:30 -0400 @@ -16,6 +16,13 @@ ****************************************************************************/ /** + * The date format used in the sitemap. + */ +if (!defined('DATE_W3C')) { + define('DATE_W3C', 'Y-m-d\TH:i:s+00:00'); +} + +/** * The timestamp of server request to avoid repeatedly generating value. */ if (!defined('REQUEST_TIME')) { @@ -28,15 +35,22 @@ if (!defined('REQUEST_TIME')) { } /** - * The date format used in the sitemap. + * The flag set when a sitemap link is not enabled. */ -define('XMLSITEMAP_DATE_W3C', 'Y-m-d\TH:i:s\Z'); +define('XMLSITEMAP_LINK_DISABLED', 1); + /***************************************************************************** * Drupal hooks. ****************************************************************************/ /** + * Implementation of hook_boot(). + */ +function xmlsitemap_boot() { +} + +/** * Implementation of hook_form_alter(). */ function xmlsitemap_form_alter(&$form, &$form_state, $form_id) { @@ -56,10 +70,8 @@ function xmlsitemap_form_alter(&$form, & function xmlsitemap_help($path, $arg) { switch ($path) { case 'admin/settings/xmlsitemap': - case 'admin/settings/xmlsitemap/additional': case 'admin/settings/xmlsitemap/engines': - case 'admin/settings/xmlsitemap/tools': - $output = t('The sitemap is located at @sitemap.', array('@sitemap' => url('sitemap.xml', array('absolute' => TRUE)))); + $output = t('The sitemap is located at @sitemap.', array('@sitemap' => url('sitemap.xml', array('absolute' => TRUE)))); break; case 'admin/help#xmlsitemap': $output = '

'. t('XML sitemap automatically creates a sitemap that conforms to the sitemaps.org specification. This helps search engines keep their search results up to date.', array('@sitemaps.org' => 'http://www.sitemaps.org')) .'

'; @@ -67,10 +79,8 @@ function xmlsitemap_help($path, $arg) { $output .= '

'. t('By itself, the XML sitemap module adds only the front page of your site to the sitemap. Other types of links are handled by supporting modules.') .'

'; $optional = ''; foreach (module_implements('xmlsitemap_description', TRUE) as $module) { - $description = module_invoke($module, 'xmlsitemap_description'); - if (!empty($description)) { - $optional .= $description; - } + $function = $module .'_xmlsitemap_description'; + $optional .= $function(); } if (!empty($optional)) { $output .= "
$optional
"; @@ -107,70 +117,36 @@ function xmlsitemap_menu() { 'type' => MENU_DEFAULT_LOCAL_TASK, 'file' => 'xmlsitemap.admin.inc', ); - $items['admin/settings/xmlsitemap/additional'] = array( - 'title' => 'Additional links', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('xmlsitemap_additional_links'), - 'access arguments' => $access_config, - 'type' => MENU_LOCAL_TASK, - 'file' => 'xmlsitemap.admin.inc', - ); - $items['admin/settings/xmlsitemap/additional/list'] = array( - 'title' => 'List', - 'type' => MENU_DEFAULT_LOCAL_TASK, - 'weight' => -10, - ); - $items['admin/settings/xmlsitemap/additional/add'] = array( - 'title' => 'Add link', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('xmlsitemap_additional_links_edit'), - 'access arguments' => $access_config, - 'type' => MENU_LOCAL_TASK, - 'file' => 'xmlsitemap.admin.inc', - ); $items['admin/settings/xmlsitemap/tools'] = array( 'title' => 'Tools', + 'description' => 'Sitemap tools.', 'page callback' => 'drupal_get_form', 'page arguments' => array('xmlsitemap_tools'), 'access arguments' => $access_config, 'type' => MENU_LOCAL_TASK, 'file' => 'xmlsitemap.admin.inc', ); - $items['admin/settings/xmlsitemap/additional/delete/%xmlsitemap_additional'] = array( - 'title' => 'Delete', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('xmlsitemap_additional_links_delete_confirm', 5), - 'access arguments' => $access_config, - 'parent' => 'admin/settings/xmlsitemap/additional/list', - 'type' => MENU_CALLBACK, - 'file' => 'xmlsitemap.admin.inc', - ); - $items['admin/settings/xmlsitemap/additional/edit/%xmlsitemap_additional'] = array( - 'title' => 'Edit link', - 'page callback' => 'drupal_get_form', - 'page arguments' => array('xmlsitemap_additional_links_edit', 5), - 'access arguments' => $access_config, - 'parent' => 'admin/settings/xmlsitemap/additional/list', - 'type' => MENU_CALLBACK, - 'file' => 'xmlsitemap.admin.inc', - ); $items['sitemap.xml'] = array( 'title' => 'Sitemap index', - 'page callback' => 'xmlsitemap_output_index', + 'page callback' => 'xmlsitemap_output', 'access arguments' => $access_content, 'type' => MENU_CALLBACK, 'file' => 'xmlsitemap.pages.inc', ); - for ($chunk = 0; $chunk < xmlsitemap_chunk_count(); ++$chunk) { - $items["sitemap-$chunk.xml"] = array( - 'title' => 'Sitemap !number', - 'title arguments' => array('!number' => $chunk), - 'page callback' => 'xmlsitemap_output_chunk', - 'page arguments' => array((string) $chunk), - 'access arguments' => $access_content, - 'type' => MENU_CALLBACK, - 'file' => 'xmlsitemap.pages.inc', - ); + $chunk_size = variable_get('xmlsitemap_chunk_size', 1000); + $link_count = xmlsitemap_link_count(); + if ($link_count > $chunk_size) { + for ($chunk = 0; $chunk < $link_count / $chunk_size; ++$chunk) { + $items["sitemap$chunk.xml"] = array( + 'title' => 'Sitemap !number', + 'title arguments' => array('!number' => $chunk), + 'page callback' => 'xmlsitemap_output', + 'page arguments' => array((string) $chunk), + 'access arguments' => $access_content, + 'type' => MENU_CALLBACK, + 'file' => 'xmlsitemap.pages.inc', + ); + } } return $items; } @@ -190,214 +166,119 @@ function xmlsitemap_robotstxt() { } /** - * Implementation of hook_theme(). + * Implementation of hook_xmlsitemap_operations(). */ -function xmlsitemap_theme() { +function xmlsitemap_xmlsitemap_operations() { return array( - 'xmlsitemap_additional_links' => array( - 'arguments' => array('form' => array()), - 'file' => 'xmlsitemap.admin.inc', - ) + 'delete_cache_files' => array( + 'label' => t('Delete the sitemap cache files'), + 'callback' => 'xmlsitemap_delete_cache_files', + ), + 'flag_sitemap' => array( + 'label' => t('Flag the sitemap as requiring update'), + 'callback' => 'xmlsitemap_flag_sitemap', + ), ); } +/***************************************************************************** + * Public functions. + ****************************************************************************/ + /** - * Implementation of hook_xmlsitemap_link_count(). + * Return the API identifier currently inplemented in the module. + * @return + * A string identifying the current API version. */ -function xmlsitemap_xmlsitemap_link_count() { - $query = "SELECT COUNT(*) FROM {xmlsitemap_additional} WHERE status = %d"; - return 1 + db_result(db_query($query, TRUE)); +function xmlsitemap_api() { + return '1.0'; } /** - * Implementation of hook_xmlsitemap_links(). - */ -function xmlsitemap_xmlsitemap_links($fp, $from, $count = 0) { - $link = new stdClass(); - $link->loc = url(NULL, array('absolute' => TRUE)); - $changed = variable_get('xmlsitemap_front_page_changed', -1); - $changefreq = variable_get('xmlsitemap_front_page_changefreq', 3600); - if ($changed == -1 || REQUEST_TIME - $changed > $changefreq) { - $changed = REQUEST_TIME; - variable_set('xmlsitemap_front_page_changed', REQUEST_TIME); - } - $link->changed = $changed; - $link->changefreq = $changefreq; - $link->priority = variable_get('xmlsitemap_front_page_priority', 1.0); - xmlsitemap_output_link($fp, $link); - $query = "SELECT * FROM {xmlsitemap_additional} WHERE status = %d ORDER BY changed DESC, previously_changed DESC"; - if ($count) { - $result = db_query_range($query, TRUE, $from, $count); + * Batch callback called when the batch operations are completed. + */ +function xmlsitemap_batch_operations_finished($success, $results, $operations) { + if ($success) { + drupal_set_message(t('The update has been performed.')); } else { - $result = db_query($query, TRUE); - } - while (--$count > 0 && ($row = db_fetch_object($result))) { - $changefreq = max($row->changed - $row->previously_changed, REQUEST_TIME - $row->changed); - $link->loc = url($row->pdata, array('absolute' => TRUE)); - $link->changed = $row->changed; - $link->changefreq = $changefreq; - xmlsitemap_output_link($fp, $link); + drupal_set_message(t('An error occurred and processing did not complete.'), 'error'); + $message = format_plural($count = count($results), '1 item successfully processed.', '@count items successfully processed.'); + if ($count) { + $message .= theme('item_list', $results, t('Last items successfully processed:')); + } + drupal_set_message($message); } } -/***************************************************************************** - * Public functions. - ****************************************************************************/ - /** - * Load the additional link with the passed ID. - * @param $lid - * The ID of the additional link to load from the database. - * @return - * An additional link object, or FALSE. + * Return the string used to identify the cache file for the sitemap content. */ -function xmlsitemap_additional_load($mid) { - return db_fetch_object(db_query("SELECT * FROM {xmlsitemap_additional} WHERE mid = %d", $mid)); -} - -function xmlsitemap_cache_filename($chunk) { +function xmlsitemap_cache_id() { + static $id; global $base_url, $language; - $filename = ''; - $chunks_info= variable_get('xmlsitemap_sitemap_chunks_info', array()); - $md5 = substr(md5($base_url), 0, 8); - foreach ($chunks_info as $module => $info) { - // if first chunk is less than zero, the module is not enabled. - if ($info['first chunk'] < 0) { - continue; - } - if (empty($info['chunks'])) { - continue; - } - if ($chunk < $info['first chunk']) { - break; - } - if ($chunk >= $info['first chunk'] && $chunk <= $info['first chunk'] + $info['chunks'] - 1) { - $delta = $chunk - $info['first chunk']; - return $md5 . $info['id'] . $delta . $language->language .'.xml'; - } + if (!isset($id)) { + $id = substr(md5($language->language . $base_url), 0, 8); } - return ''; + return $id; } /** - * Return the number of chunks that are present in the sitemap. - * @param $reset - * TRUE, if the cached value must be recalculated. - * @return - * The number of chunks the sitemap is made of. + * Return the array for the cron limit options. */ -function xmlsitemap_chunk_count($reset = FALSE) { - static $chunk_count; - if (!isset($chunk_count) || $reset) { - $chunk_size = variable_get('xmlsitemap_chunk_size', 1000); - $chunks_info = variable_get('xmlsitemap_sitemap_chunks_info', array()); - $link_count = 0; - $module_count = 0; - foreach(module_implements('xmlsitemap_link_count') as $module) { - if (!isset($chunks_info[$module]['id'])) { - $chunks_info[$module]['id'] = substr(md5($module), 0, 8); - } - $result = module_invoke($module, 'xmlsitemap_link_count'); - $count = empty($result) ? 0 : $result; - if (!isset($info['links']) && $info['links'] != $count) { - $chunks_info[$module]['needs update'] = TRUE; - } - elseif (!isset($chunks_info[$module]['needs update'])) { - $chunks_info[$module]['needs update'] = FALSE; - } - $chunks_info[$module]['links'] = $count; - $link_count += $count; - $module_count++; - } - $chunk_count = (integer) ($link_count / $chunk_size); - // Adjust the chunk count because each module will not share its own - // chunks with the other modules. - $chunk_count += $module_count; - if ($chunk_count > 1000) { - $new_size = (integer) ceil($link_count / 100000) * 100; - // Set which modules needs to update their cache files. - foreach ($chunks_info as $module => $info) { - if (!empty($info['links']) && $info['links'] > $old_size) { - $chunks_info[$module]['needs update'] = TRUE; - } - elseif (!isset($chunks_info[$module]['needs update'])) { - $chunks_info[$module]['needs update'] = FALSE; - } - } - variable_set('xmlsitemap_chunk_size', $new_size); - $chunk_size = $new_size; - } - $chunk_count = 0; - foreach ($chunks_info as $module => $info) { - // If a module is not enabled, its links will not be added to the - // sitemap. - if (!module_exists($module)) { - $chunks_info[$module]['first chunk'] = -1; - } - else { - $chunks_info[$module]['chunks'] = $chunks = ceil($info['links'] / $chunk_size); - if ($chunks) { - $chunks_info[$module]['first chunk'] = $chunk_count; - $chunk_count += $chunks; - } - else { - $chunks_info[$module]['first chunk'] = -1; - } - } - } - variable_set('xmlsitemap_sitemap_chunks_info', $chunks_info); - } - return $chunk_count; +function xmlsitemap_cron_options() { + return array( + '400' => t('400'), + '300' => t('300'), + '200' => t('200'), + '150' => t('150'), + '100' => t('100'), + '75' => t('75'), + '50' => t('50'), + '25' => t('25'), + '20' => t('20'), + '15' => t('15'), + '10' => t('10'), + '5' => t('5'), + '-1' => t('0'), + ); +} + +/** + * Delete the cache file used for the sitemap content, and mark the sitemap as + * changed. + */ +function xmlsitemap_delete_cache_files() { + $parent_directory = variable_get('xmlsitemap_cache_directory', file_directory_path() .'/xmlsitemap'); + if (!is_dir($parent_directory)) { + return; + } + file_scan_directory($parent_directory, 'xsm-.*\.xml', array('.', '..', 'CVS'), 'unlink', FALSE); + xmlsitemap_flag_sitemap(); + return; } /** * Mark the sitemap as changed, and the cache as needing update. - * @param $value - * The value to set the flag to. - * @param $module - * The module that changed the sitemap. - */ -function xmlsitemap_flag_sitemap($value = FALSE, $module = NULL) { - if (variable_get('xmlsitemap_ping_sitemap', FALSE) != $value) { - variable_set('xmlsitemap_ping_sitemap', TRUE); - } - if ($value) { - xmlsitemap_chunk_count(TRUE); + */ +function xmlsitemap_flag_sitemap() { + if (!variable_get('xmlsitemap_sitemap_is_changed', FALSE)) { + variable_set('xmlsitemap_sitemap_is_changed', TRUE); + } + if (!variable_get('xmlsitemap_sitemap_needs_update', FALSE)) { + variable_set('xmlsitemap_sitemap_needs_update', TRUE); } } /** - * Output the sitemap XML data for the passed link. - * @param $fp - * The file resource for the file to write, or = if the output is printed - * on the screen. - * @param $link - * The object containing the data to print. - */ -function xmlsitemap_output_link($fp, $link) { - $template = << - %loc - %lastmod - %changefreq - %priority - - -EOC; - $trans = array( - '%loc' => check_url($link->loc), - '%lastmod' => gmdate(XMLSITEMAP_DATE_W3C, $link->changed), - '%changefreq' => xmlsitemap_sitemap_frequency($link->changefreq), - '%priority' => number_format($link->priority, 1), - ); - $output = strtr($template, $trans); - if ($fp) { - fwrite($fp, $output); - } - else { - print $output; + * Return the number of links present in xmlsitemap table. + */ +function xmlsitemap_link_count() { + static $link_count; + if (!isset($link_count)) { + $link_count = db_result(db_query("SELECT COUNT(xsm.loc)". xmlsitemap_sitemap_query())); } + return $link_count; } /** @@ -411,9 +292,9 @@ EOC; * @return * An array of priority options. */ -function xmlsitemap_priority_options($exclude = FALSE, $default = FALSE) { +function xmlsitemap_priority_options($option = '') { $options = array( - '1.0' => t('1.0'), + '1' => t('1.0'), '0.9' => t('0.9'), '0.8' => t('0.8'), '0.7' => t('0.7'), @@ -423,12 +304,12 @@ function xmlsitemap_priority_options($ex '0.3' => t('0.3'), '0.2' => t('0.2'), '0.1' => t('0.1'), - '0.0' => t('0.0'), + '0' => t('0.0') ); - if ($exclude) { + if ($option == 'exclude' || $option == 'both') { $options['-1'] = t('Not in sitemap'); } - if ($default) { + if ($option == 'default' || $option == 'both') { $options['-2'] = t('Default'); } return $options; @@ -464,6 +345,36 @@ function xmlsitemap_sitemap_frequency($i } /** + * Complete the query used to select rows from the xmlsitemap table. + */ +function xmlsitemap_sitemap_query() { + global $language; + $default = language_default(); + $language_query = "AND xsm.language IN ('". $language->language ."', '')"; + switch(variable_get('language_negotiation', LANGUAGE_NEGOTIATION_NONE)) { + case LANGUAGE_NEGOTIATION_NONE: + $language_query = ''; + break; + case LANGUAGE_NEGOTIATION_PATH_DEFAULT: + case LANGUAGE_NEGOTIATION_PATH: + if (variable_get('xmlsitemap_all_links_to_default_language', 0) && $language->language == $default->language) { + $language_query = ''; + } + break; + } + return " + FROM {xmlsitemap} xsm + INNER JOIN {system} s ON s.name = xsm.module + WHERE s.type = 'module' + AND s.status = 1 + AND xsm.changefreq <> 0 + AND xsm.changed <> 0 + $language_query + AND (xsm.priority >= 0 AND xsm.priority <= 1) + "; +} + +/** * Return an array used to add additional form fields in the user form. */ function xmlsitemap_user_form_fieldset() { @@ -474,7 +385,6 @@ function xmlsitemap_user_form_fieldset() '#type' => 'fieldset', '#title' => t('XML sitemap'), '#collapsible' => TRUE, - '#collapsed' => TRUE, '#access' => user_access('override profile settings') || user_access('administer users'), '#weight' => 7, ); @@ -483,151 +393,15 @@ function xmlsitemap_user_form_fieldset() return $form; } -/** - * Write data in the sitemap table. This is an altered version of - * drupal_write_record() adapted for the specific case. - * @param $link - * The object containing the data to be written in the database table. - * @return - * FALSE, if the data have not be written in the database. - */ -function xmlsitemap_write_link(&$link, $table, $module = NULL) { - // If the module name is not given, use the table name. - if (empty($table)) { - return FALSE; - } - if (empty($module)) { - $module = $table; - } - // Retrieve the default values, and use them for the object properties that - // have not been set; serial type fields are ignored. - $schema = drupal_get_schema($table); - if (empty($schema)) { - return FALSE; - } - // Fill in defaults for fields that are not set. - foreach ($schema['fields'] as $field => $info) { - if (!isset($link->$field) && isset($info['default'])) { - $link->$field = $info['default']; - } - } - // Allow third-party modules to alter the data being saved. - drupal_alter('xmlsitemap_link', $link, $module); - // Verify if there is already a row that refers to the same link. - $condition = "pdata = ". db_type_placeholder($schema['fields']['pdata']['type']); - $row = db_fetch_object(db_query("SELECT * FROM {". $table ."} WHERE ". $condition, $link->pdata)); - $update = ($row !== FALSE); - // Don't write a new row if status is FALSE. - if (!($update || $link->status)) { - return FALSE; - } - if ($update) { - $link->mid = $row->mid; - if ($link->changed > $row->changed) { - $link->previously_changed = $row->changed; - } - else { - $link->previously_changed = $row->previously_changed; - $link->changed = $row->changed; - } - } - $fields = $defs = $values = $serials = $placeholders = array(); - foreach ($schema['fields'] as $field => $info) { - if ($info['type'] == 'serial') { - $serials[] = $field; - // Ignore values for serials when inserting data. - if (!$update) { - unset($link->$field); - } - } - if (isset($link->$field)) { - $fields[] = $field; - $placeholders[] = db_type_placeholder($info['type']); - $values[] = $link->$field; - } - } - $query = ''; - if (!$update) { - $query = "INSERT INTO {". $table ."} (". implode(', ', $fields) .') VALUES ('. implode(', ', $placeholders) .')'; - $return = SAVED_NEW; - } - else { - $query = ''; - foreach ($fields as $id => $field) { - if ($query) { - $query .= ', '; - } - $query .= $field .' = '. $placeholders[$id]; - } - $condition = "pdata = ". db_type_placeholder($schema['fields']['pdata']['type']); - $values[] = $link->pdata; - $query = "UPDATE {". $table ."} SET $query WHERE ". $condition; - $return = SAVED_UPDATED; - } - // Execute the SQL. - if (db_query($query, $values)) { - if ($serials) { - // Get last insert ids and fill them in. - foreach ($serials as $field) { - $link->$field = db_last_insert_id($table, $field); - } - } - xmlsitemap_flag_sitemap(TRUE, $module); - } - else { - $return = FALSE; - } - return $return; -} - /***************************************************************************** * Private functions. ****************************************************************************/ /** - * Return the list of all additional links created. + * Return the revision number as extracted from the CVS revision tag. */ -function _xmlsitemap_additional_links_list() { - static $links; - if (!isset($links)) { - $links = array(); - $result = db_query("SELECT * FROM {xmlsitemap_additional} ORDER BY priority ASC"); - while ($link = db_fetch_object($result)) { - $links[$link->mid] = $link; - } - } - return $links; -} - -/** - * Shutdown function for cron cleanup. - * @see drupal_cron_cleanup(). - */ -function _xmlsitemap_cron_cleanup() { - // See if the semaphore is still locked. - if (variable_get('xmlsitemap_cron_semaphore', FALSE)) { - watchdog('xmlsitemap', 'Cache files building task exceeded the time limit and was aborted.', array(), WATCHDOG_WARNING); - // Release cron semaphore - variable_del('xmlsitemap_cron_semaphore'); - } -} - -function _xmlsitemap_cron_semaphore() { - if ($semaphore = variable_get('xmlsitemap_cron_semaphore', FALSE)) { - if (REQUEST_TIME - $semaphore > 3600) { - // Either the task has been running for more than an hour or the semaphore - // was not reset due to a database error. - watchdog('xmlsitemap', 'The cache files building task has been running for more than an hour and is most likely stuck.', array(), WATCHDOG_ERROR); - // Release cron semaphore - variable_del('xmlsitemap_cron_semaphore'); - } - else { - // The task is still running normally. - watchdog('xmlsitemap', 'Attempting to re-run the cache files building task while it is already running.', array(), WATCHDOG_WARNING); - } - return $semaphore; - } - return FALSE; +function _xmlsitemap_revision() { + return preg_replace('/\$Rev[iI]sion:\s+(.*)\s+\$/iU', '$1', '$Revision: 1.1.2.104 $'); } /** diff -upNr -x CVS -x CHANGELOG.txt -x '.#*' -I '.*\$Id.*' xmlsitemap-DRUPAL-6--1/xmlsitemap/xmlsitemap.pages.inc xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap/xmlsitemap.pages.inc --- xmlsitemap-DRUPAL-6--1/xmlsitemap/xmlsitemap.pages.inc 2009-06-06 12:58:38 -0400 +++ xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap/xmlsitemap.pages.inc 2009-05-07 08:59:31 -0400 @@ -16,85 +16,239 @@ ****************************************************************************/ /** - * Menu callback; display the sitemap . + * Menu callback; display the sitemap. * @param $chunk * An integer specifying which chunk of the sitemap is being requested. * If not set and there is more than one chunk, display the sitemap index. */ -function xmlsitemap_output_chunk($chunk) { - if (!is_numeric($chunk)) { - drupal_not_found(); - exit(); +function xmlsitemap_output($chunk = NULL) { + global $user; + $chunk_size = variable_get('xmlsitemap_chunk_size', 1000); + $link_count = xmlsitemap_link_count(); + if (($link_count / $chunk_size) > 1000) { + $chunk_size = (integer) $link_count / 1000; + if ($chunk_size != variable_get('xmlsitemap_chunk_size', 1000)) { + variable_set('xmlsitemap_chunk_size', $chunk_size); + } } - $chunks = xmlsitemap_chunk_count(); - if ($chunk < 0 || $chunk > $chunks) { + if (isset($chunk) && !preg_match('/[0-9]+/', $chunk)) { drupal_not_found(); exit(); } - $file = xmlsitemap_cache_filename($chunk); - // If the cache file doesn't exist, try to get the first 100 links directly - // from the database tables. - if (!file_exists($file)) { - _xmlsitemap_output_chunk_links($chunk); - exit(); + if (!$user->uid) { + $id = xmlsitemap_cache_id(); + if (variable_get('xmlsitemap_sitemap_needs_update', FALSE)) { + variable_set('xmlsitemap_update_timestamp', REQUEST_TIME); + db_query("DELETE FROM {xmlsitemap} WHERE type ='frontpage'"); + $row = new stdClass(); + $row->module = 'xmlsitemap'; + $row->type = 'frontpage'; + $changefreq = variable_get('xmlsitemap_front_page_changefreq', 3600); + $row->changed = REQUEST_TIME - $changefreq; + $row->changefreq = $changefreq; + $row->priority = variable_get('xmlsitemap_front_page_priority', 1); + drupal_write_record('xmlsitemap', $row); + module_invoke_all('xmlsitemap_links'); + variable_set('xmlsitemap_sitemap_needs_update', FALSE); + $result = _xmlsitemap_create_cache_files(); + if (variable_get("xmlsitemap_create_cache_result_$id", -1) !== $result) { + variable_set("xmlsitemap_create_cache_result_$id", $result); + } + } + elseif (_xmlsitemap_check_cache_files()) { + $result = _xmlsitemap_create_cache_files(); + if (variable_get("xmlsitemap_create_cache_result_$id", -1) !== $result) { + variable_set("xmlsitemap_create_cache_result_$id", $result); + } + } + if (!isset($chunk)) { + if (($chunks = (integer) $link_count / $chunk_size) != variable_get('xmlsitemap_previous_chunks_count', -1)) { + variable_set('xmlsitemap_previous_chunks_count', $chunks); + if (!variable_get('menu_rebuild_needed', FALSE)) { + variable_set('menu_rebuild_needed', TRUE); + } + } + } + if (isset($result) && !$result) { + drupal_not_found(); + exit(); + } + } + $parent_directory = variable_get('xmlsitemap_cache_directory', file_directory_path() .'/xmlsitemap'); + $headers = array("Content-type: text/xml; charset=utf-8"); + if (isset($chunk)) { + if ($chunk < $link_count / $chunk_size) { + file_transfer("$parent_directory/xsm-$id-$chunk.xml", $headers); + } } else { - $headers = array('Content-type: text/xml; charset=utf-8'); - file_transfer($file, $headers); + file_transfer("$parent_directory/xsm-$id.xml", $headers); } } +/***************************************************************************** + * Private functions. + ****************************************************************************/ + /** - * Menu callback; display the sitemap index. + * Check the cache files. + * @return + * TRUE if the cache files must be updated / created, FALSE otherwise. */ -function xmlsitemap_output_index() { - drupal_set_header('Content-type: text/xml; charset=utf-8'); - $chunks = xmlsitemap_chunk_count(); - if ($chunks != variable_get('xmlsitemap_previous_chunk_count', -1)) { - if (!variable_get('menu_rebuild_needed', FALSE)) { - variable_set('menu_rebuild_needed', TRUE); - } - variable_set('xmlsitemap_previous_chunk_count', $chunks); - } - print <<< EOL - - - -EOL; - for ($chunk = 0; $chunk < $chunks; ++$chunk) { - $url = url("sitemap-$chunk.xml", array('absolute' => TRUE)); - print << - $url - - -EOL; +function _xmlsitemap_check_cache_files() { + $chunk_size = variable_get('xmlsitemap_chunk_size', 1000); + $link_count = xmlsitemap_link_count(); + $id = xmlsitemap_cache_id(); + $parent_directory = variable_get('xmlsitemap_cache_directory', file_directory_path() .'/xmlsitemap'); + // If the directory that should contains the cache files doesn't exist, then + // the cache files must be created. + if (!is_dir($parent_directory)) { + return TRUE; + } + $update_timestamp = variable_get('xmlsitemap_update_timestamp', REQUEST_TIME); + // If the cache files creation has failed last time, the cache files must be + // created. + if (variable_get("xmlsitemap_create_cache_result_$id", -1) !== TRUE) { + return TRUE; + } + // If the main cache file doesn't exist, then the cache files must be + // created. + if (!file_exists($parent_directory ."/xsm-$id.xml")) { + return TRUE; } - print ''; + // If the main cache file has been created before the sitemap content has + // been updated, then the cache files must be updated. + if (filemtime($parent_directory ."/xsm-$id.xml") < $update_timestamp) { + return TRUE; + } + // Check also the other cache files. + if ($link_count > $chunk_size) { + for ($chunk = 0; $chunk < $link_count / $chunk_size; ++$chunk) { + if (!file_exists($parent_directory ."/xsm-$id-$chunk.xml")) { + return TRUE; + } + if (filemtime($parent_directory ."/xsm-$id-$chunk.xml") < $update_timestamp) { + return TRUE; + } + } + } + return FALSE; } -/***************************************************************************** - * Private functions. - ****************************************************************************/ +/** + * Create a sitemap chunk cache file. + * @param $fp + * A file resource used to write in. + * @param $chunk_size + * The number of links the chunk must cointain. + * @param $chunk + * The progressive number associated with the sitemap chunk (starting from + * 0). + */ +function _xmlsitemap_create_cache_chunk($fp, $chunk_size, $chunk = 0) { + fwrite($fp, ''."\n"); + fwrite($fp, ''."\n"); + $start = $chunk * $chunk_size; + $links = db_query_range("SELECT xsm.loc, xsm.module, xsm.type, xsm.id, xsm.sid, xsm.changed, xsm.changefreq, xsm.priority". xmlsitemap_sitemap_query() ."ORDER BY xsm.priority DESC, xsm.changed DESC, xsm.changefreq, xsm.loc", $start, $chunk_size); + while ($link = db_fetch_object($links)) { + if ($link->type == 'frontpage') { + $url = url(NULL, array('absolute' => TRUE)); + } + elseif ($link->module && function_exists($link->module .'_xmlsitemap_url')) { + $function = $link->module .'_xmlsitemap_url'; + $url = $function($link->loc, $link->type, $link->id, $link->sid); + } + else { + $url = url($link->loc, array('absolute' => TRUE)); + } + $link->url = $url; + if ($link->module && function_exists($link->module .'_xmlsitemap_link_status')) { + $function = $link->module .'_xmlsitemap_link_status'; + $link->status = $function($link->type, $link->id, $link->sid); + } + else { + $link->status = 0; + } + drupal_alter('xmlsitemap_data', $link); + if (($link->status & XMLSITEMAP_LINK_DISABLED) != XMLSITEMAP_LINK_DISABLED) { + fwrite($fp, ' '."\n"); + fwrite($fp, ' '. check_url($link->url) .''."\n"); + fwrite($fp, ' '. gmdate(DATE_W3C, $link->changed) .''."\n"); + fwrite($fp, ' '. xmlsitemap_sitemap_frequency($link->changefreq) .''."\n"); + fwrite($fp, ' '. number_format($link->priority, 1) .''."\n"); + fwrite($fp, ' '."\n"); + } + } + fwrite($fp, ''); +} -function _xmlsitemap_output_chunk_links($chunk) { - drupal_set_header('Content-type: text/xml; charset=utf-8'); - $chunks_info = variable_get('xmlsitemap_sitemap_chunks_info', array()); - print << - - -EOL; - foreach ($chunks_info as $module => $info) { - $first_chunk = $info['first chunk']; - if ($chunk >= $first_chunk && $chunk <= $first_chunk + $info['chunks'] - 1) { - $count = variable_get('xmlsitemap_chunk_size', 1000); - $from = ($chunk - $first_chunk) * $count; - module_invoke($module, 'xmlsitemap_links', 0, $from, $count); - break; +/** + * Create the cache files containing the sitemap. + * @return + * TRUE if the operation has been successfull, FALSE otherwise. + */ +function _xmlsitemap_create_cache_files() { + $chunk_size = variable_get('xmlsitemap_chunk_size', 1000); + $link_count = xmlsitemap_link_count(); + $id = xmlsitemap_cache_id(); + $parent_directory = variable_get('xmlsitemap_cache_directory', file_directory_path() .'/xmlsitemap'); + // If the directory doesn't exist, then create it. + if (!is_dir($parent_directory)) { + if (@mkdir($parent_directory)) { + @chmod($parent_directory, 0775); + } + else { + watchdog('xmlsitemap', 'Could not create the cache files directory (@directory)', array('@directory' => $parent_directory), WATCHDOG_ERROR); + return FALSE; + } + } + if ($link_count > $chunk_size) { + if (!$fp = fopen($parent_directory ."/xsm-$id.xml", 'wb')) { + watchdog('xmlsitemap', 'Cannot create the cache file (@file)', array('@file' => $parent_directory ."/xsm-$id.xml"), WATCHDOG_ERROR); + return FALSE; + } + fwrite($fp, ''."\n"); + fwrite($fp, ''."\n"); + for ($chunk = 0; $chunk < $link_count / $chunk_size; ++$chunk) { + fwrite($fp, ' '."\n"); + fwrite($fp, ' '. url("sitemap$chunk.xml", array('absolute' => TRUE)) .''."\n"); + $from = $chunk * $chunk_size; + $changed = db_result(db_query_range("SELECT xsm.changed". xmlsitemap_sitemap_query() ."ORDER BY xsm.priority DESC, xsm.changed DESC", $from, $chunk_size)); + fwrite($fp, ' '. gmdate(DATE_W3C, $changed) .''."\n"); + fwrite($fp, ' '."\n"); + } + fwrite($fp, ''); + fclose($fp); + // Set standard file permissions for webserver-generated files. + @chmod($parent_directory ."/xsm-$id.xml", 0664); + for ($chunk = 0; $chunk < $link_count / $chunk_size; ++$chunk) { + if (!$fp = fopen($parent_directory ."/xsm-$id-$chunk.xml", 'wb')) { + watchdog('xmlsitemap', 'Cannot create the cache file (@file)', array('@file' => $parent_directory ."/xsm-$id-$chunk.xml"), WATCHDOG_ERROR); + return FALSE; + } + _xmlsitemap_create_cache_chunk($fp, $chunk_size, $chunk); + fclose($fp); + // Set standard file permissions for webserver-generated files. + @chmod($parent_directory ."/xsm-$id-$chunk.xml", 0664); + } + } + else { + if (!$fp = fopen($parent_directory ."/xsm-$id.xml", 'wb')) { + watchdog('xmlsitemap', 'Cannot create the cache file (@file)', array('@file' => $parent_directory ."/xsm-$id.xml"), WATCHDOG_ERROR); + return FALSE; } + _xmlsitemap_create_cache_chunk($fp, $chunk_size); + fclose($fp); + // Set standard file permissions for webserver-generated files. + @chmod($parent_directory ."/xsm-$id.xml", 0664); } - print ''; + return TRUE; } /** diff -upNr -x CVS -x CHANGELOG.txt -x '.#*' -I '.*\$Id.*' xmlsitemap-DRUPAL-6--1/xmlsitemap_engines/translations/fr.po xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_engines/translations/fr.po --- xmlsitemap-DRUPAL-6--1/xmlsitemap_engines/translations/fr.po 1969-12-31 19:00:00 -0500 +++ xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_engines/translations/fr.po 2009-04-01 05:38:25 -0400 @@ -0,0 +1,165 @@ +# $Id: fr.po,v 1.1.2.1 2009/04/01 09:38:25 slybud Exp $ +# +# French translation of Drupal (general) +# Copyright YEAR NAME +# 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_engines drupal6 module\n" +"POT-Creation-Date: 2009-04-01 11:14+0200\n" +"PO-Revision-Date: 2009-04-01 11:16+0100\n" +"Last-Translator: Sylvain Moreau \n" +"Language-Team: Sylvain Moreau, OWS \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_engines.module:61 +msgid "Ask.com" +msgstr "Ask.com" + +#: xmlsitemap_engines.module:67 +msgid "Submit the site map to Ask.com" +msgstr "Soumettre le plan du site à Ask.com" + +#: xmlsitemap_engines.module:72;90;114;132;162 +msgid "Submission URL" +msgstr "URL de soumission" + +#: xmlsitemap_engines.module:73;91;115;133;163 +msgid "The URL to submit the site map to. Use %placeholder like placeholder for the site map URL." +msgstr "L'URL à laquelle soumettre le plan du site. Utilisez %placeholder en tant que valeur de substitution pour l'URL du plan du site." + +#: xmlsitemap_engines.module:79 +msgid "Google" +msgstr "Google" + +#: xmlsitemap_engines.module:85 +msgid "Submit the site map to Google" +msgstr "Soumettre le plan du site à Google" + +#: xmlsitemap_engines.module:96;168 +msgid "Verification link" +msgstr "Lien de vérification" + +#: xmlsitemap_engines.module:97 +msgid "In order to show statistics, Google will ask you to verify that you control this site by creating a file with a certain name. Enter that name here and the XML Sitemap module will create a path to that file name. This will only work if you have clean URLs enabled." +msgstr "Pour pouvoir afficher des statistiques, Google vous demandera de vérifier que vous controllez ce site en créant un fichier avec un nom particulier. Entrez ici ce nom et le module XML Sitemap créera un chemin vers ce nom de fichier. Cela ne fonctionnera que si vous avez activé les URL simplifiées." + +#: xmlsitemap_engines.module:103 +msgid "Moreover.com" +msgstr "Moreover.com" + +#: xmlsitemap_engines.module:109 +msgid "Submit the site map to Moreover.com" +msgstr "Soumettre le plan du site à Moreover.com" + +#: xmlsitemap_engines.module:121 +msgid "Windows Live" +msgstr "Windows Live" + +#: xmlsitemap_engines.module:127 +msgid "Submit the site map to Windows Live" +msgstr "Soumettre le plan du site à Windows live" + +#: xmlsitemap_engines.module:138 +msgid "Authentication file" +msgstr "Fichier d'authentification" + +#: xmlsitemap_engines.module:139 +msgid "Before allowing you to view additional information, Windows Live will ask you to verify that you control this site by creating a file with a certain name. Enter that name here, and XML Sitemap will create a path to that file name. This will only work if you have clean URLs enabled." +msgstr "Avant de vous autoriser à voir des informations supplémentaires, Windows Live vous demandera de vérifier que vous controllez ce site en créant un fichier avec un nom particulier. Entrer ce nom ici et XML Sitemap créera un chemin pour ce fichier. Cela ne fonctionnera que si vous avez activé les URL simplifiées." + +#: xmlsitemap_engines.module:144 +msgid "Authentication tag" +msgstr "Tag d'authentification" + +#: xmlsitemap_engines.module:145 +msgid "Windows Live will give you an authentication tag." +msgstr "Windows Live vous donnera une balise d'authentification." + +#: xmlsitemap_engines.module:151 +msgid "Yahoo!" +msgstr "Yahoo!" + +#: xmlsitemap_engines.module:157 +msgid "Submit the site map to Yahoo!" +msgstr "Soumettre le plan du site à Yahoo!" + +#: xmlsitemap_engines.module:169 +msgid "Before allowing you to view additional information, Yahoo! will ask you to verify that you control this site by creating a file with a certain name. Enter that name here, and XML Sitemap will create a path to that file name. This will only work if you have clean URLs enabled." +msgstr "Avant de vous autoriser à voir des informations supplémentaires, Yahoo! vous demandera de vérifier que vous controllez ce site en créant un fichier avec un nom particulier. Entrer ce nom ici et XML Sitemap créera un chemin pour ce fichier. Cela ne fonctionnera que si vous avez activé les URL simplifiées." + +#: xmlsitemap_engines.module:174 +msgid "Authentication key" +msgstr "Clé d'authentification" + +#: xmlsitemap_engines.module:175 +msgid "Yahoo! will ask you to put an authentication key in the verification file." +msgstr "Yahoo! vous demandera de mettre une clé d'authentification dans le fichier de vérification." + +#: xmlsitemap_engines.module:270;275 +msgid "xmlsitemap" +msgstr "xmlsitemap" + +#: xmlsitemap_engines.module:270 +msgid "Sitemap successfully submitted to !engine." +msgstr "Le Sitemap a été soumis avec succès au moteur !engine." + +#: xmlsitemap_engines.module:275 +msgid "Error occurred submitting sitemap to !engine: !code" +msgstr "Une erreur s'est produite lors de la soumission du sitemap au moteur !engine : !code." + +#: xmlsitemap_engines.module:26 +msgid "Google verification page" +msgstr "Page de vérification de Google" + +#: xmlsitemap_engines.module:35 +msgid "Yahoo! verification page" +msgstr "Page de vérification de Yahoo!" + +#: xmlsitemap_engines.module:44 +msgid "Windows Live verification page" +msgstr "Page de vérification de Windows Live" + +#: xmlsitemap_engines.module:0 +msgid "xmlsitemap_engines" +msgstr "xmlsitemap_engines" + +#: xmlsitemap_engines.info:0 +msgid "XML Sitemap: Engines" +msgstr "XML Sitemap : Engines" + +#: xmlsitemap_engines.info:0 +msgid "Submits site map to search engines." +msgstr "Soumet le plan du site aux moteurs de recherche." + +#: xmlsitemap_engines.info:0 +msgid "XML Sitemap" +msgstr "XML Sitemap" + diff -upNr -x CVS -x CHANGELOG.txt -x '.#*' -I '.*\$Id.*' xmlsitemap-DRUPAL-6--1/xmlsitemap_engines/translations/xmlsitemap_engines.de.po xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_engines/translations/xmlsitemap_engines.de.po --- xmlsitemap-DRUPAL-6--1/xmlsitemap_engines/translations/xmlsitemap_engines.de.po 2009-06-05 19:43:29 -0400 +++ xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_engines/translations/xmlsitemap_engines.de.po 1969-12-31 19:00:00 -0500 @@ -1,183 +0,0 @@ -# $Id: xmlsitemap_engines.de.po,v 1.1.2.2 2009/06/05 23:43:29 hass Exp $ -# -# LANGUAGE translation of Drupal (gsitemap.module) -# Copyright YEAR NAME -# Generated from files: -# gsitemap.module,v 1.56.2.7 2007/03/18 21:55:39 darrenoh -# gsitemap.info,v 1.3.2.3 2007/02/13 15:57:06 darrenoh -# -msgid "" -msgstr "" -"Project-Id-Version: German translation of xmlsitemap_engines\n" -"POT-Creation-Date: 2009-06-06 01:06+0200\n" -"PO-Revision-Date: 2009-06-06 01:31+0100\n" -"Last-Translator: Alexander Haß\n" -"Language-Team: Alexander Hass\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: German\n" -"X-Poedit-Country: GERMANY\n" -"X-Poedit-SourceCharset: utf-8\n" - -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:24 -msgid "Submission settings" -msgstr "Einstellungen zur Übermittlung" - -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:29 -msgid "Submit the sitemap on content updates" -msgstr "Die Sitemap bei Inhaltsaktualisierungen übermitteln" - -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:30 -#, fuzzy -msgid "If enabled, search engines will be notified of changes to the sitemap each time the site content is updated." -msgstr "Sobald aktiviert, werden die Suchmaschinen bei jeder Inhaltsänderung über die Aktualisierung der Sitemap benachrichtigt." - -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:35 -msgid "Frequency of sitemap submission" -msgstr "" - -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:36 -msgid "The rate at which the sitemap is submitted to the search engines." -msgstr "" - -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:40 -msgid "Every 6 months" -msgstr "Alle 6 Monate" - -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:42 -msgid "Every 15 days" -msgstr "Alle 15 Tage" - -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:46 -msgid "Never" -msgstr "Nie" - -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:51 -msgid "Submission URLs" -msgstr "Eintragungs-URLs" - -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:52 -msgid "Use %placeholder instead of the sitemap URL. Select the checkbox to enable the submission for a specific search engine." -msgstr "" - -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:75 -msgid "Verification settings" -msgstr "Verifizierungseinstellungen" - -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:80 -msgid "Google verification link" -msgstr "Google Überprüfungslink" - -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:81 -#, fuzzy -msgid "In order to show statistics, Google will ask you to verify that you control this site by creating a file with a certain name. Enter that name here and the XML sitemap module will create a path to that file name. This will only work if you have clean URLs enabled." -msgstr "Um die Statistiken anzusehen, wird Google zu einer Überprüfung des Eigentümers der Website auffordern, indem eine Datei mit einem bestimmten Namen erzeugt wird. Dazu wird hier der Name eingegeben und das XML-Sitemap-Modul wird den Pfad zu dieser Datei erzeugen. Hierzu müssen „lesbare URLs“ aktiviert sein." - -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:86 -msgid "Windows Live authentication file" -msgstr "Windows Live Authentifizierungsdatei" - -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:87 -#, fuzzy -msgid "Before allowing you to view additional information, Windows Live will ask you to verify that you control this site by creating a file with a certain name. Enter that name here, and XML sitemap will create a path to that file name. This will only work if you have clean URLs enabled." -msgstr "Windows Live wird zu einer Überprüfung des Eigentümers der Website auffordern, bevor der Zugriff auf zusätzliche Informationen gewährt wird, indem eine Datei mit einem bestimmten Namen erzeugt wird. Dazu wird hier der Name eingegeben und das XML-Sitemap-Modul wird den Pfad zu dieser Datei erzeugen. Hierzu müssen „lesbare URLs“ aktiviert sein." - -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:92 -msgid "Windows Live authentication tag" -msgstr "Windows Live Authentifizierungstag" - -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:93 -msgid "Windows Live will give you an authentication tag." -msgstr "Der von Windows Live zur Verfügung gestellte Authentifizierungsschlüssel." - -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:98 -msgid "Yahoo! verification link" -msgstr "Yahoo! Überprüfungslink" - -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:99 -#, fuzzy -msgid "Before allowing you to view additional information, Yahoo! will ask you to verify that you control this site by creating a file with a certain name. Enter that name here, and XML sitemap will create a path to that file name. This will only work if you have clean URLs enabled." -msgstr "Yahoo! wird zu einer Überprüfung des Eigentümers der Website auffordern, bevor der Zugriff auf zusätzliche Informationen gewährt wird, indem eine Datei mit einem bestimmten Namen erzeugt wird. Dazu wird hier der Name eingegeben und das XML-Sitemap-Modul wird den Pfad zu dieser Datei erzeugen. Hierzu müssen „lesbare URLs“ aktiviert sein." - -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:104 -msgid "Yahoo! authentication key" -msgstr "Yahoo! Authentifizierungsschlüssel" - -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:105 -msgid "Yahoo! will ask you to put an authentication key in the verification file." -msgstr "Der von Yahoo! für die Kontrolldatei zur Verfügung gestellte Authentifizierungsschlüssel." - -#: xmlsitemap_engines/xmlsitemap_engines.module:93 -msgid "Ask.com" -msgstr "Ask.com" - -#: xmlsitemap_engines/xmlsitemap_engines.module:94 -msgid "Google" -msgstr "Google" - -#: xmlsitemap_engines/xmlsitemap_engines.module:95 -msgid "Moreover.com" -msgstr "Moreover.com" - -#: xmlsitemap_engines/xmlsitemap_engines.module:96 -msgid "Microsoft Live" -msgstr "Microsoft Live" - -#: xmlsitemap_engines/xmlsitemap_engines.module:97 -msgid "Yahoo!" -msgstr "Yahoo!" - -#: xmlsitemap_engines/xmlsitemap_engines.module:101 -msgid "Submit to search engines" -msgstr "An Suchmaschinen übermitteln" - -#: xmlsitemap_engines/xmlsitemap_engines.module:106;47 -msgid "Search engines" -msgstr "Suchmaschinen" - -#: xmlsitemap_engines/xmlsitemap_engines.module:113 -msgid "Submit sitemap" -msgstr "Sitemap übermitteln" - -#: xmlsitemap_engines/xmlsitemap_engines.module:127;177 -msgid "The sitemap has been submitted to the search engines." -msgstr "Die Sitemap wurde an die Suchmaschinen übertragen." - -#: xmlsitemap_engines/xmlsitemap_engines.module:155 -msgid "The sitemap has been successfully submitted to %engine." -msgstr "Die Sitemap wurde erfolgreich an %engine übertragen." - -#: xmlsitemap_engines/xmlsitemap_engines.module:158 -msgid "An error occurred while submitting the sitemap to %engine: !code." -msgstr "Fehler beim Übertragen der Sitemap an %engine: !code." - -#: xmlsitemap_engines/xmlsitemap_engines.module:48 -msgid "Configure the submission settings of the XML sitemap to the search engines." -msgstr "Die Übermittlungseinstellungen der XML-Sitemap an die Suchmaschinen konfigurieren." - -#: xmlsitemap_engines/xmlsitemap_engines.module:57 -msgid "Google verification page" -msgstr "Überprüfungsseite für Google" - -#: xmlsitemap_engines/xmlsitemap_engines.module:67 -msgid "Yahoo! verification page" -msgstr "Überprüfungsseite für Yahoo!" - -#: xmlsitemap_engines/xmlsitemap_engines.module:77 -msgid "Windows Live verification page" -msgstr "Überprüfungsseite für Windows Live" - -#: xmlsitemap_engines/xmlsitemap_engines.module:0 -msgid "xmlsitemap_engines" -msgstr "xmlsitemap_engines" - -#: xmlsitemap_engines/xmlsitemap_engines.info:0 -msgid "XML sitemap engines" -msgstr "XML-Sitemap - Engines" - -#: xmlsitemap_engines/xmlsitemap_engines.info:0 -msgid "Submit the sitemap to search engines." -msgstr "Die Sitemap an Suchmaschinen übermitteln." - diff -upNr -x CVS -x CHANGELOG.txt -x '.#*' -I '.*\$Id.*' xmlsitemap-DRUPAL-6--1/xmlsitemap_engines/translations/xmlsitemap_engines.fr.po xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_engines/translations/xmlsitemap_engines.fr.po --- xmlsitemap-DRUPAL-6--1/xmlsitemap_engines/translations/xmlsitemap_engines.fr.po 2009-06-05 18:07:57 -0400 +++ xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_engines/translations/xmlsitemap_engines.fr.po 1969-12-31 19:00:00 -0500 @@ -1,165 +0,0 @@ -# $Id: xmlsitemap_engines.fr.po,v 1.1.2.1 2009/06/05 22:07:57 hass Exp $ -# -# French translation of Drupal (general) -# Copyright YEAR NAME -# 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_engines drupal6 module\n" -"POT-Creation-Date: 2009-04-01 11:14+0200\n" -"PO-Revision-Date: 2009-04-01 11:16+0100\n" -"Last-Translator: Sylvain Moreau \n" -"Language-Team: Sylvain Moreau, OWS \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_engines.module:61 -msgid "Ask.com" -msgstr "Ask.com" - -#: xmlsitemap_engines.module:67 -msgid "Submit the site map to Ask.com" -msgstr "Soumettre le plan du site à Ask.com" - -#: xmlsitemap_engines.module:72;90;114;132;162 -msgid "Submission URL" -msgstr "URL de soumission" - -#: xmlsitemap_engines.module:73;91;115;133;163 -msgid "The URL to submit the site map to. Use %placeholder like placeholder for the site map URL." -msgstr "L'URL à laquelle soumettre le plan du site. Utilisez %placeholder en tant que valeur de substitution pour l'URL du plan du site." - -#: xmlsitemap_engines.module:79 -msgid "Google" -msgstr "Google" - -#: xmlsitemap_engines.module:85 -msgid "Submit the site map to Google" -msgstr "Soumettre le plan du site à Google" - -#: xmlsitemap_engines.module:96;168 -msgid "Verification link" -msgstr "Lien de vérification" - -#: xmlsitemap_engines.module:97 -msgid "In order to show statistics, Google will ask you to verify that you control this site by creating a file with a certain name. Enter that name here and the XML Sitemap module will create a path to that file name. This will only work if you have clean URLs enabled." -msgstr "Pour pouvoir afficher des statistiques, Google vous demandera de vérifier que vous controllez ce site en créant un fichier avec un nom particulier. Entrez ici ce nom et le module XML Sitemap créera un chemin vers ce nom de fichier. Cela ne fonctionnera que si vous avez activé les URL simplifiées." - -#: xmlsitemap_engines.module:103 -msgid "Moreover.com" -msgstr "Moreover.com" - -#: xmlsitemap_engines.module:109 -msgid "Submit the site map to Moreover.com" -msgstr "Soumettre le plan du site à Moreover.com" - -#: xmlsitemap_engines.module:121 -msgid "Windows Live" -msgstr "Windows Live" - -#: xmlsitemap_engines.module:127 -msgid "Submit the site map to Windows Live" -msgstr "Soumettre le plan du site à Windows live" - -#: xmlsitemap_engines.module:138 -msgid "Authentication file" -msgstr "Fichier d'authentification" - -#: xmlsitemap_engines.module:139 -msgid "Before allowing you to view additional information, Windows Live will ask you to verify that you control this site by creating a file with a certain name. Enter that name here, and XML Sitemap will create a path to that file name. This will only work if you have clean URLs enabled." -msgstr "Avant de vous autoriser à voir des informations supplémentaires, Windows Live vous demandera de vérifier que vous controllez ce site en créant un fichier avec un nom particulier. Entrer ce nom ici et XML Sitemap créera un chemin pour ce fichier. Cela ne fonctionnera que si vous avez activé les URL simplifiées." - -#: xmlsitemap_engines.module:144 -msgid "Authentication tag" -msgstr "Tag d'authentification" - -#: xmlsitemap_engines.module:145 -msgid "Windows Live will give you an authentication tag." -msgstr "Windows Live vous donnera une balise d'authentification." - -#: xmlsitemap_engines.module:151 -msgid "Yahoo!" -msgstr "Yahoo!" - -#: xmlsitemap_engines.module:157 -msgid "Submit the site map to Yahoo!" -msgstr "Soumettre le plan du site à Yahoo!" - -#: xmlsitemap_engines.module:169 -msgid "Before allowing you to view additional information, Yahoo! will ask you to verify that you control this site by creating a file with a certain name. Enter that name here, and XML Sitemap will create a path to that file name. This will only work if you have clean URLs enabled." -msgstr "Avant de vous autoriser à voir des informations supplémentaires, Yahoo! vous demandera de vérifier que vous controllez ce site en créant un fichier avec un nom particulier. Entrer ce nom ici et XML Sitemap créera un chemin pour ce fichier. Cela ne fonctionnera que si vous avez activé les URL simplifiées." - -#: xmlsitemap_engines.module:174 -msgid "Authentication key" -msgstr "Clé d'authentification" - -#: xmlsitemap_engines.module:175 -msgid "Yahoo! will ask you to put an authentication key in the verification file." -msgstr "Yahoo! vous demandera de mettre une clé d'authentification dans le fichier de vérification." - -#: xmlsitemap_engines.module:270;275 -msgid "xmlsitemap" -msgstr "xmlsitemap" - -#: xmlsitemap_engines.module:270 -msgid "Sitemap successfully submitted to !engine." -msgstr "Le Sitemap a été soumis avec succès au moteur !engine." - -#: xmlsitemap_engines.module:275 -msgid "Error occurred submitting sitemap to !engine: !code" -msgstr "Une erreur s'est produite lors de la soumission du sitemap au moteur !engine : !code." - -#: xmlsitemap_engines.module:26 -msgid "Google verification page" -msgstr "Page de vérification de Google" - -#: xmlsitemap_engines.module:35 -msgid "Yahoo! verification page" -msgstr "Page de vérification de Yahoo!" - -#: xmlsitemap_engines.module:44 -msgid "Windows Live verification page" -msgstr "Page de vérification de Windows Live" - -#: xmlsitemap_engines.module:0 -msgid "xmlsitemap_engines" -msgstr "xmlsitemap_engines" - -#: xmlsitemap_engines.info:0 -msgid "XML Sitemap: Engines" -msgstr "XML Sitemap : Engines" - -#: xmlsitemap_engines.info:0 -msgid "Submits site map to search engines." -msgstr "Soumet le plan du site aux moteurs de recherche." - -#: xmlsitemap_engines.info:0 -msgid "XML Sitemap" -msgstr "XML Sitemap" - diff -upNr -x CVS -x CHANGELOG.txt -x '.#*' -I '.*\$Id.*' xmlsitemap-DRUPAL-6--1/xmlsitemap_engines/translations/xmlsitemap_engines.pot xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_engines/translations/xmlsitemap_engines.pot --- xmlsitemap-DRUPAL-6--1/xmlsitemap_engines/translations/xmlsitemap_engines.pot 2009-06-06 12:58:38 -0400 +++ xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_engines/translations/xmlsitemap_engines.pot 2009-04-25 19:21:32 -0400 @@ -1,17 +1,16 @@ -# $Id: xmlsitemap_engines.pot,v 1.1.2.5 2009/06/05 23:08:44 hass Exp $ +# $Id: xmlsitemap_engines.pot,v 1.1.2.4 2009/04/25 23:21:32 kiam Exp $ # -# LANGUAGE translation of Drupal (xmlsitemap_engines) +# LANGUAGE translation of Drupal (general) # Copyright YEAR NAME # Generated from files: -# xmlsitemap_engines.admin.inc,v 1.1.2.9 2009/05/23 14:08:18 kiam -# xmlsitemap_engines.module,v 1.5.2.42 2009/05/25 02:52:15 kiam -# xmlsitemap_engines.info,v 1.2.2.3 2009/05/05 21:53:44 earnie +# xmlsitemap_engines.module,v 1.5.2.24 2009/04/25 23:13:45 kiam +# xmlsitemap_engines.info,v 1.2.2.2 2009/04/24 18:33:54 kiam # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2009-06-06 01:06+0200\n" +"POT-Creation-Date: 2009-04-26 01:19+0200\n" "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" "Last-Translator: NAME \n" "Language-Team: LANGUAGE \n" @@ -20,159 +19,199 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:24 +#: xmlsitemap_engines.module:136 msgid "Submission settings" msgstr "" -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:29 -msgid "Submit the sitemap on content updates" +#: xmlsitemap_engines.module:141 +msgid "Submit the site map when updated" msgstr "" -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:30 -msgid "If enabled, search engines will be notified of changes to the sitemap each time the site content is updated." +#: xmlsitemap_engines.module:142 +msgid "If enabled, the search engines will be notified of changes to the site map each time it is updated." msgstr "" -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:35 -msgid "Frequency of sitemap submission" +#: xmlsitemap_engines.module:147 +msgid "Log access" msgstr "" -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:36 -msgid "The rate at which the sitemap is submitted to the search engines." +#: xmlsitemap_engines.module:148 +msgid "If enabled, a watchdog entry will be made each time the site map is accessed, containing information about the requestor." msgstr "" -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:40 +#: xmlsitemap_engines.module:153 +msgid "Frequency of site map submission" +msgstr "" + +#: xmlsitemap_engines.module:154 +msgid "The rate at which the site map is submitted to the search engines." +msgstr "" + +#: xmlsitemap_engines.module:157 +msgid "Yearly" +msgstr "" + +#: xmlsitemap_engines.module:158 msgid "Every 6 months" msgstr "" -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:42 +#: xmlsitemap_engines.module:159 +msgid "Monthly" +msgstr "" + +#: xmlsitemap_engines.module:160 msgid "Every 15 days" msgstr "" -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:46 -msgid "Never" +#: xmlsitemap_engines.module:161 +msgid "Weekly" msgstr "" -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:51 -msgid "Submission URLs" +#: xmlsitemap_engines.module:162 +msgid "Daily" msgstr "" -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:52 -msgid "Use %placeholder instead of the sitemap URL. Select the checkbox to enable the submission for a specific search engine." +#: xmlsitemap_engines.module:163 +msgid "Hourly" msgstr "" -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:75 -msgid "Verification settings" +#: xmlsitemap_engines.module:164 +msgid "Never" msgstr "" -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:80 -msgid "Google verification link" +#: xmlsitemap_engines.module:170 +msgid "Ask.com" msgstr "" -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:81 -msgid "In order to show statistics, Google will ask you to verify that you control this site by creating a file with a certain name. Enter that name here and the XML sitemap module will create a path to that file name. This will only work if you have clean URLs enabled." +#: xmlsitemap_engines.module:176 +msgid "Submit the site map to Ask.com" msgstr "" -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:86 -msgid "Windows Live authentication file" +#: xmlsitemap_engines.module:181;199;223;241;271 +msgid "Submission URL" msgstr "" -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:87 -msgid "Before allowing you to view additional information, Windows Live will ask you to verify that you control this site by creating a file with a certain name. Enter that name here, and XML sitemap will create a path to that file name. This will only work if you have clean URLs enabled." +#: xmlsitemap_engines.module:182;200;224;242;272 +msgid "The URL to submit the site map to. Use %placeholder like placeholder for the site map URL." msgstr "" -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:92 -msgid "Windows Live authentication tag" +#: xmlsitemap_engines.module:188 +msgid "Google" msgstr "" -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:93 -msgid "Windows Live will give you an authentication tag." +#: xmlsitemap_engines.module:194 +msgid "Submit the site map to Google" msgstr "" -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:98 -msgid "Yahoo! verification link" +#: xmlsitemap_engines.module:205;277 +msgid "Verification link" msgstr "" -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:99 -msgid "Before allowing you to view additional information, Yahoo! will ask you to verify that you control this site by creating a file with a certain name. Enter that name here, and XML sitemap will create a path to that file name. This will only work if you have clean URLs enabled." +#: xmlsitemap_engines.module:206 +msgid "In order to show statistics, Google will ask you to verify that you control this site by creating a file with a certain name. Enter that name here and the XML Sitemap module will create a path to that file name. This will only work if you have clean URLs enabled." msgstr "" -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:104 -msgid "Yahoo! authentication key" +#: xmlsitemap_engines.module:212 +msgid "Moreover.com" msgstr "" -#: xmlsitemap_engines/xmlsitemap_engines.admin.inc:105 -msgid "Yahoo! will ask you to put an authentication key in the verification file." +#: xmlsitemap_engines.module:218 +msgid "Submit the site map to Moreover.com" msgstr "" -#: xmlsitemap_engines/xmlsitemap_engines.module:93 -msgid "Ask.com" +#: xmlsitemap_engines.module:230 +msgid "Windows Live" msgstr "" -#: xmlsitemap_engines/xmlsitemap_engines.module:94 -msgid "Google" +#: xmlsitemap_engines.module:236 +msgid "Submit the site map to Windows Live" msgstr "" -#: xmlsitemap_engines/xmlsitemap_engines.module:95 -msgid "Moreover.com" +#: xmlsitemap_engines.module:247 +msgid "Authentication file" +msgstr "" + +#: xmlsitemap_engines.module:248 +msgid "Before allowing you to view additional information, Windows Live will ask you to verify that you control this site by creating a file with a certain name. Enter that name here, and XML Sitemap will create a path to that file name. This will only work if you have clean URLs enabled." msgstr "" -#: xmlsitemap_engines/xmlsitemap_engines.module:96 -msgid "Microsoft Live" +#: xmlsitemap_engines.module:253 +msgid "Authentication tag" msgstr "" -#: xmlsitemap_engines/xmlsitemap_engines.module:97 +#: xmlsitemap_engines.module:254 +msgid "Windows Live will give you an authentication tag." +msgstr "" + +#: xmlsitemap_engines.module:260 msgid "Yahoo!" msgstr "" -#: xmlsitemap_engines/xmlsitemap_engines.module:101 -msgid "Submit to search engines" +#: xmlsitemap_engines.module:266 +msgid "Submit the site map to Yahoo!" msgstr "" -#: xmlsitemap_engines/xmlsitemap_engines.module:106;47 -msgid "Search engines" +#: xmlsitemap_engines.module:278 +msgid "Before allowing you to view additional information, Yahoo! will ask you to verify that you control this site by creating a file with a certain name. Enter that name here, and XML Sitemap will create a path to that file name. This will only work if you have clean URLs enabled." msgstr "" -#: xmlsitemap_engines/xmlsitemap_engines.module:113 -msgid "Submit sitemap" +#: xmlsitemap_engines.module:283 +msgid "Authentication key" msgstr "" -#: xmlsitemap_engines/xmlsitemap_engines.module:127;177 -msgid "The sitemap has been submitted to the search engines." +#: xmlsitemap_engines.module:284 +msgid "Yahoo! will ask you to put an authentication key in the verification file." msgstr "" -#: xmlsitemap_engines/xmlsitemap_engines.module:155 -msgid "The sitemap has been successfully submitted to %engine." +#: xmlsitemap_engines.module:58;370;375 +msgid "xmlsitemap" msgstr "" -#: xmlsitemap_engines/xmlsitemap_engines.module:158 -msgid "An error occurred while submitting the sitemap to %engine: !code." +#: xmlsitemap_engines.module:58 +msgid "Sitemap downloaded by @user-agent at @address." msgstr "" -#: xmlsitemap_engines/xmlsitemap_engines.module:48 -msgid "Configure the submission settings of the XML sitemap to the search engines." +#: xmlsitemap_engines.module:370 +msgid "Sitemap successfully submitted to !engine." msgstr "" -#: xmlsitemap_engines/xmlsitemap_engines.module:57 +#: xmlsitemap_engines.module:375 +msgid "Error occurred submitting sitemap to !engine: !code" +msgstr "" + +#: xmlsitemap_engines.module:78 +msgid "Search engines" +msgstr "" + +#: xmlsitemap_engines.module:79 +msgid "Configure the submission settings of the XML site map to the search engines." +msgstr "" + +#: xmlsitemap_engines.module:87 msgid "Google verification page" msgstr "" -#: xmlsitemap_engines/xmlsitemap_engines.module:67 +#: xmlsitemap_engines.module:96 msgid "Yahoo! verification page" msgstr "" -#: xmlsitemap_engines/xmlsitemap_engines.module:77 +#: xmlsitemap_engines.module:105 msgid "Windows Live verification page" msgstr "" -#: xmlsitemap_engines/xmlsitemap_engines.module:0 +#: xmlsitemap_engines.module:0 msgid "xmlsitemap_engines" msgstr "" -#: xmlsitemap_engines/xmlsitemap_engines.info:0 -msgid "XML sitemap engines" +#: xmlsitemap_engines.info:0 +msgid "XML Sitemap: Engines" +msgstr "" + +#: xmlsitemap_engines.info:0 +msgid "Submits site map to search engines." msgstr "" -#: xmlsitemap_engines/xmlsitemap_engines.info:0 -msgid "Submit the sitemap to search engines." +#: xmlsitemap_engines.info:0 +msgid "XML Sitemap" msgstr "" diff -upNr -x CVS -x CHANGELOG.txt -x '.#*' -I '.*\$Id.*' xmlsitemap-DRUPAL-6--1/xmlsitemap_engines/xmlsitemap_engines.admin.inc xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_engines/xmlsitemap_engines.admin.inc --- xmlsitemap-DRUPAL-6--1/xmlsitemap_engines/xmlsitemap_engines.admin.inc 2009-05-25 21:28:43 -0400 +++ xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_engines/xmlsitemap_engines.admin.inc 2009-05-07 08:59:31 -0400 @@ -26,10 +26,16 @@ function xmlsitemap_engines_settings() { ); $form['submission']['xmlsitemap_engines_submit'] = array( '#type' => 'checkbox', - '#title' => t('Submit the sitemap on content updates'), - '#description' => t('If enabled, search engines will be notified of changes to the sitemap each time the site content is updated.'), + '#title' => t('Submit the sitemap when updated'), + '#description' => t('If enabled, the search engines will be notified of changes to the sitemap each time it is updated.'), '#default_value' => variable_get('xmlsitemap_engines_submit', FALSE), ); + $form['submission']['xmlsitemap_engines_log_access'] = array( + '#type' => 'checkbox', + '#title' => t('Log access'), + '#description' => t('If enabled, a watchdog entry will be made each time the sitemap is accessed, containing information about the requestor.'), + '#default_value' => variable_get('xmlsitemap_engines_log_access', FALSE), + ); $form['submission']['xmlsitemap_engines_cron_submit_frequency'] = array( '#type' => 'select', '#title' => t('Frequency of sitemap submission'), @@ -46,62 +52,123 @@ function xmlsitemap_engines_settings() { '-1' => t('Never'), ), ); - $form['submission']['submission_urls'] = array( + // Ask.com fields. + $form['ask'] = array( '#type' => 'fieldset', - '#title' => t('Submission URLs'), - '#description' => t('Use %placeholder instead of the sitemap URL. Select the checkbox to enable the submission for a specific search engine.', array('%placeholder' => '[sitemap]')), + '#title' => t('Ask.com'), '#collapsible' => TRUE, + '#collapsed' => TRUE, + ); + $form['ask']['xmlsitemap_engines_ask_submit'] = array( + '#type' => 'checkbox', + '#title' => t('Submit the sitemap to Ask.com'), + '#default_value' => variable_get('xmlsitemap_engines_ask_submit', FALSE), ); - foreach (_xmlsitemap_engines_get_engines_data() as $id => $info) { - $form['submission']['submission_urls'][$id]['inline'] = array( - '#prefix' => '
', - '#suffix' => '
' - ); - $form['submission']['submission_urls'][$id]['inline']["xmlsitemap_engines_{$id}_submit"] = array( - '#type' => 'checkbox', - '#title' => '', - '#default_value' => variable_get("xmlsitemap_engines_{$id}_submit", FALSE), - ); - $form['submission']['submission_urls'][$id]['inline']["xmlsitemap_engines_{$id}_url"] = array( - '#type' => 'textfield', - '#title' => '', - '#default_value' => variable_get("xmlsitemap_engines_{$id}_url", $info[1]), - '#size' => 40, - '#field_suffix' => ''. $info[0] .'', - ); - } - $form['verification'] = array( + $form['ask']['xmlsitemap_engines_ask_url'] = array( + '#type' => 'textfield', + '#title' => t('Submission URL'), + '#description' => t('The URL to submit the sitemap to. Use %placeholder like placeholder for the sitemap URL.', array('%placeholder' => '[sitemap]')), + '#default_value' => variable_get('xmlsitemap_engines_ask_url', 'http://submissions.ask.com/ping?sitemap=[sitemap]'), + ); + // Google fields. + $form['google'] = array( '#type' => 'fieldset', - '#title' => t('Verification settings'), + '#title' => t('Google'), '#collapsible' => TRUE, + '#collapsed' => TRUE, + ); + $form['google']['xmlsitemap_engines_google_submit'] = array( + '#type' => 'checkbox', + '#title' => t('Submit the sitemap to Google'), + '#default_value' => variable_get('xmlsitemap_engines_google_submit', FALSE), ); - $form['verification']['google']['xmlsitemap_engines_google_verify'] = array( + $form['google']['xmlsitemap_engines_google_url'] = array( '#type' => 'textfield', - '#title' => t('Google verification link'), + '#title' => t('Submission URL'), + '#description' => t('The URL to submit the sitemap to. Use %placeholder like placeholder for the sitemap URL.', array('%placeholder' => '[sitemap]')), + '#default_value' => variable_get('xmlsitemap_engines_google_url', 'http://www.google.com/webmasters/tools/ping?sitemap=[sitemap]'), + ); + $form['google']['xmlsitemap_engines_google_verify'] = array( + '#type' => 'textfield', + '#title' => t('Verification link'), '#description' => t('In order to show statistics, Google will ask you to verify that you control this site by creating a file with a certain name. Enter that name here and the XML sitemap module will create a path to that file name. This will only work if you have clean URLs enabled.'), '#default_value' => variable_get('xmlsitemap_engines_google_verify', ''), ); - $form['verification']['live']['xmlsitemap_engines_live_verify'] = array( + // Moreover.com fields. + $form['moreover'] = array( + '#type' => 'fieldset', + '#title' => t('Moreover.com'), + '#collapsible' => TRUE, + '#collapsed' => TRUE, + ); + $form['moreover']['xmlsitemap_engines_moreover_submit'] = array( + '#type' => 'checkbox', + '#title' => t('Submit the sitemap to Moreover.com'), + '#default_value' => variable_get('xmlsitemap_engines_moreover_submit', FALSE), + ); + $form['moreover']['xmlsitemap_engines_moreover_url'] = array( '#type' => 'textfield', - '#title' => t('Windows Live authentication file'), + '#title' => t('Submission URL'), + '#description' => t('The URL to submit the sitemap to. Use %placeholder like placeholder for the sitemap URL.', array('%placeholder' => '[sitemap]')), + '#default_value' => variable_get('xmlsitemap_engines_moreover_url', 'http://api.moreover.com/ping?u=[sitemap]'), + ); + // Windows Live fields. + $form['live'] = array( + '#type' => 'fieldset', + '#title' => t('Windows Live'), + '#collapsible' => TRUE, + '#collapsed' => TRUE, + ); + $form['live']['xmlsitemap_engines_live_submit'] = array( + '#type' => 'checkbox', + '#title' => t('Submit the sitemap to Windows Live'), + '#default_value' => variable_get('xmlsitemap_engines_live_submit', FALSE), + ); + $form['live']['xmlsitemap_engines_live_url'] = array( + '#type' => 'textfield', + '#title' => t('Submission URL'), + '#description' => t('The URL to submit the sitemap to. Use %placeholder like placeholder for the sitemap URL.', array('%placeholder' => '[sitemap]')), + '#default_value' => variable_get('xmlsitemap_engines_live_url', 'http://webmaster.live.com/ping.aspx?siteMap=[sitemap]'), + ); + $form['live']['xmlsitemap_engines_live_verify'] = array( + '#type' => 'textfield', + '#title' => t('Authentication file'), '#description' => t('Before allowing you to view additional information, Windows Live will ask you to verify that you control this site by creating a file with a certain name. Enter that name here, and XML sitemap will create a path to that file name. This will only work if you have clean URLs enabled.'), '#default_value' => variable_get('xmlsitemap_engines_live_verify', 'LiveSearchSiteAuth.xml'), ); - $form['verification']['live']['xmlsitemap_engines_live_verify_string'] = array( + $form['live']['xmlsitemap_engines_live_verify_string'] = array( '#type' => 'textfield', - '#title' => t('Windows Live authentication tag'), + '#title' => t('Authentication tag'), '#description' => t('Windows Live will give you an authentication tag.'), '#default_value' => variable_get('xmlsitemap_engines_live_verify_string', ''), ); - $form['verification']['yahoo']['xmlsitemap_engines_yahoo_verify'] = array( + // Yahoo! fields. + $form['yahoo'] = array( + '#type' => 'fieldset', + '#title' => t('Yahoo!'), + '#collapsible' => TRUE, + '#collapsed' => TRUE, + ); + $form['yahoo']['xmlsitemap_engines_yahoo_submit'] = array( + '#type' => 'checkbox', + '#title' => t('Submit the sitemap to Yahoo!'), + '#default_value' => variable_get('xmlsitemap_engines_yahoo_submit', FALSE), + ); + $form['yahoo']['xmlsitemap_engines_yahoo_url'] = array( + '#type' => 'textfield', + '#title' => t('Submission URL'), + '#description' => t('The URL to submit the sitemap to. Use %placeholder like placeholder for the sitemap URL.', array('%placeholder' => '[sitemap]')), + '#default_value' => variable_get('xmlsitemap_engines_yahoo_url', 'http://search.yahooapis.com/SiteExplorerService/V1/ping?sitemap=[sitemap]'), + ); + $form['yahoo']['xmlsitemap_engines_yahoo_verify'] = array( '#type' => 'textfield', - '#title' => t('Yahoo! verification link'), + '#title' => t('Verification link'), '#description' => t('Before allowing you to view additional information, Yahoo! will ask you to verify that you control this site by creating a file with a certain name. Enter that name here, and XML sitemap will create a path to that file name. This will only work if you have clean URLs enabled.'), '#default_value' => variable_get('xmlsitemap_engines_yahoo_verify', ''), ); - $form['verification']['yahoo']['xmlsitemap_engines_yahoo_verify_string'] = array( + $form['yahoo']['xmlsitemap_engines_yahoo_verify_string'] = array( '#type' => 'textfield', - '#title' => t('Yahoo! authentication key'), + '#title' => t('Authentication key'), '#description' => t('Yahoo! will ask you to put an authentication key in the verification file.'), '#default_value' => variable_get('xmlsitemap_engines_yahoo_verify_string', ''), ); diff -upNr -x CVS -x CHANGELOG.txt -x '.#*' -I '.*\$Id.*' xmlsitemap-DRUPAL-6--1/xmlsitemap_engines/xmlsitemap_engines.install xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_engines/xmlsitemap_engines.install --- xmlsitemap-DRUPAL-6--1/xmlsitemap_engines/xmlsitemap_engines.install 2009-05-25 21:28:43 -0400 +++ xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_engines/xmlsitemap_engines.install 2009-05-07 08:59:31 -0400 @@ -43,6 +43,41 @@ function xmlsitemap_engines_update_6100( /** * Implementation of hook_update_N(). */ +function xmlsitemap_engines_update_6101() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_engines_update_6102() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_engines_update_6103() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_engines_update_6104() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_engines_update_6105() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ function xmlsitemap_engines_update_6106() { $variables = array( 'submit', diff -upNr -x CVS -x CHANGELOG.txt -x '.#*' -I '.*\$Id.*' xmlsitemap-DRUPAL-6--1/xmlsitemap_engines/xmlsitemap_engines.module xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_engines/xmlsitemap_engines.module --- xmlsitemap-DRUPAL-6--1/xmlsitemap_engines/xmlsitemap_engines.module 2009-05-25 21:28:43 -0400 +++ xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_engines/xmlsitemap_engines.module 2009-05-07 08:59:31 -0400 @@ -19,22 +19,53 @@ * Implementation of hook_cron(). */ function xmlsitemap_engines_cron() { - if (!variable_get('site_offline', 0) && variable_get('xmlsitemap_engines_cron_submit_frequency', 3600) > 0 && variable_get('xmlsitemap_ping_sitemap', FALSE)) { + if (!variable_get('site_offline', 0) && variable_get('xmlsitemap_engines_cron_submit_frequency', 3600) > 0 && variable_get('xmlsitemap_sitemap_is_changed', FALSE)) { if ((REQUEST_TIME - variable_get('xmlsitemap_engines_cron_timestamp_submit', REQUEST_TIME)) >= variable_get('xmlsitemap_engines_cron_submit_frequency', 3600)) { - xmlsitemap_engines_ping_sitemap(NULL, TRUE); - variable_set('xmlsitemap_ping_sitemap', FALSE); + xmlsitemap_engines_ping_sitemap(); + variable_set('xmlsitemap_sitemap_is_changed', FALSE); variable_set('xmlsitemap_engines_cron_timestamp_submit', REQUEST_TIME); } } } /** - * Implementation of hook_init(). + * Implementation of hook_exit(). */ -function xmlsitemap_engines_init() { - if (!variable_get('site_offline', 0) && arg(0) != 'batch' && variable_get('xmlsitemap_engines_submit', FALSE) && variable_get('xmlsitemap_ping_sitemap', FALSE)) { - xmlsitemap_engines_ping_sitemap(NULL, TRUE); - variable_set('xmlsitemap_ping_sitemap', FALSE); +function xmlsitemap_engines_exit() { + drupal_bootstrap(DRUPAL_BOOTSTRAP_PATH); + if (variable_get('site_offline', 0) || arg(0) == 'batch') { + return; + } + if (variable_get('xmlsitemap_engines_log_access', FALSE)) { + $items = array(); + $chunk_size = variable_get('xmlsitemap_chunk_size', 1000); + $link_count = xmlsitemap_link_count(); + if ($link_count > $chunk_size) { + for ($chunk = 0; $chunk < $link_count / $chunk_size; ++$chunk) { + $items["sitemap$chunk.xml"] = $chunk; + } + } + if (isset($items[arg(0)]) && is_null(arg(1))) { + $chunk = $items[arg(0)]; + if ($chunk < $link_count / $chunk_size) { + $write_log = TRUE; + } + } + elseif (arg(0) == 'sitemap.xml' && is_null(arg(1))) { + $write_log = TRUE; + } + if (isset($write_log)) { + watchdog('xmlsitemap', 'Sitemap downloaded by @user-agent at @address.', + array( + '@user-agent' => xmlsitemap_engines_search_engine_id(), + '@address' => ip_address(), + ) + ); + } + } + if (!isset($write_log) && variable_get('xmlsitemap_engines_submit', FALSE) && variable_get('xmlsitemap_sitemap_is_changed', FALSE)) { + xmlsitemap_engines_ping_sitemap(); + variable_set('xmlsitemap_sitemap_is_changed', FALSE); } } @@ -86,127 +117,125 @@ function xmlsitemap_engines_menu() { } /** - * Implementation of hook_form_FORM_ID_alter(). + * Implementation of hook_xmlsitemap_operations(). */ -function xmlsitemap_engines_form_xmlsitemap_tools_alter(&$form, &$from_state) { - $options = array( - 'ask' => t('Ask.com'), - 'google' => t('Google'), - 'moreover' => t('Moreover.com'), - 'live' => t('Microsoft Live'), - 'yahoo' => t('Yahoo!'), - ); - $form['xmlsitemap_engine_submit_to_search_engines'] = array( - '#type' => 'fieldset', - '#title' => t('Submit to search engines'), - '#collapsible' => TRUE, - ); - $form['xmlsitemap_engine_submit_to_search_engines']['search_engines'] = array( - '#type' => 'checkboxes', - '#title' => t('Search engines'), - '#default_value' => array(), - '#options' => $options, - '#checkall' => TRUE, - ); - $form['xmlsitemap_engine_submit_to_search_engines']['submit_to_search_engines'] = array( - '#type' => 'submit', - '#value' => t('Submit sitemap'), - '#submit' => array('xmlsitemap_engines_submit_to_search_engines_submit'), +function xmlsitemap_engines_xmlsitemap_operations() { + return array( + 'submit_to_all' => array( + 'label' => t('Submit the sitemap to all the active search engines'), + 'callback' => 'xmlsitemap_engines_ping_sitemap', + ), + 'submit_to_askcom' => array( + 'label' => t('Submit the sitemap to Ask.com'), + 'callback' => 'xmlsitemap_engines_ping_sitemap', + 'callback arguments' => array('engine' => 'ask'), + ), + 'submit_to_google' => array( + 'label' => t('Submit the sitemap to Google'), + 'callback' => 'xmlsitemap_engines_ping_sitemap', + 'callback arguments' => array('engine' => 'google'), + ), + 'submit_to_moreovercom' => array( + 'label' => t('Submit the sitemap to Moreover.com'), + 'callback' => 'xmlsitemap_engines_ping_sitemap', + 'callback arguments' => array('engine' => 'moreover'), + ), + 'submit_to_live' => array( + 'label' => t('Submit the sitemap to Microsoft Live'), + 'callback' => 'xmlsitemap_engines_ping_sitemap', + 'callback arguments' => array('engine' => 'live'), + ), + 'submit_to_yahoo' => array( + 'label' => t('Submit the sitemap to Yahoo!'), + 'callback' => 'xmlsitemap_engines_ping_sitemap', + 'callback arguments' => array('engine' => 'yahoo'), + ), ); } /***************************************************************************** - * Menu callbacks / form builders, submit/validate functions. - ****************************************************************************/ - -/** - * Submit function for the 'Submit the sitemap to the search engines' operation. - */ -function xmlsitemap_engines_submit_to_search_engines_submit($form, &$form_state) { - xmlsitemap_engines_ping_sitemap(array_filter($form_state['values']['search_engines'])); - drupal_set_message(t('The sitemap has been submitted to the search engines.')); -} - -/***************************************************************************** * Public functions. ****************************************************************************/ /** * Submit the sitemap to the selected engines. - * @param $engines - * An array of search engine identifiers. - * @param $all - * If $engines is an empty array, and $all is TRUE, the sitemap will be - * submitted to all the enabled search engines. - */ -function xmlsitemap_engines_ping_sitemap($engines = array(), $all = FALSE) { - if (empty($engines) && $all) { - $engines = array('ask', 'google', 'moreover', 'live', 'yahoo'); - } - if (!empty($engines)) { - foreach (_xmlsitemap_engines_get_engines_data() as $id => $info) { - if (in_array($id, $engines) && variable_get("xmlsitemap_engines_{$id}_submit", FALSE)) { - $url = strtr( - variable_get("xmlsitemap_engines_{$id}_url", $info[1]), - array('[sitemap]' => url('sitemap.xml', array('absolute' => TRUE))) - ); - $result = drupal_http_request($url); - if ($result->code == 200) { - watchdog('xmlsitemap', 'The sitemap has been successfully submitted to %engine.', array('%engine' => $info[0])); - } - else { - watchdog('xmlsitemap', 'An error occurred while submitting the sitemap to %engine: !code.', - array('%engine' => $info[0], '!code' => 0 + $result->code), WATCHDOG_ERROR - ); - } - } - } - } -} - -/***************************************************************************** - * Private functions - sitemap operations. - ****************************************************************************/ - -function _xmlsitemap_engines_operation_ping_sitemap() { - xmlsitemap_engines_ping_sitemap( - array_filter( - variable_get('xmlsitemap_engine_parameter_search_engines', array()) - ) - ); - drupal_set_message(t('The sitemap has been submitted to the search engines.')); -} - -/***************************************************************************** - * Private functions. - ****************************************************************************/ - -function _xmlsitemap_engines_get_engines_data() { - return array( + */ +function xmlsitemap_engines_ping_sitemap($engine = NULL) { + $engines = array( 'ask' => array( 'Ask.com', - 'http://submissions.ask.com/ping?sitemap=[sitemap]', + 'http://submissions.ask.com/ping?sitemap=[sitemap]' ), 'google' => array( 'Google', - 'http://www.google.com/webmasters/tools/ping?sitemap=[sitemap]', + 'http://www.google.com/webmasters/tools/ping?sitemap=[sitemap]' ), 'moreover' => array( 'Moreover.com', - 'http://api.moreover.com/ping?u=[sitemap]', + 'http://api.moreover.com/ping?u=[sitemap]' ), 'live' => array( 'Windows Live', - 'http://webmaster.live.com/ping.aspx?siteMap=[sitemap]', + 'http://webmaster.live.com/ping.aspx?siteMap=[sitemap]' ), 'yahoo' => array( 'Yahoo!', - 'http://search.yahooapis.com/SiteExplorerService/V1/ping?sitemap=[sitemap]', + 'http://search.yahooapis.com/SiteExplorerService/V1/ping?sitemap=[sitemap]' ), ); + if (!isset($engine)) { + foreach ($engines as $id => $info) { + if (variable_get("xmlsitemap_engines_{$id}_submit", FALSE)) { + xmlsitemap_engines_submit_sitemap($info[0], "xmlsitemap_engines_{$id}_url", $info[1]); + } + } + } + elseif (isset($engines[$engine])) { + xmlsitemap_engines_submit_sitemap($engines[$engine][0], "xmlsitemap_engines_{$engine}_url", $engines[$engine][1]); + } } /** - * @} End of "addtogroup xmlsitemap". + * Return the identifier for the search engine that accessed to the sitemap, + * or the content of $_SERVER['HTTP_USER_AGENT']. */ +function xmlsitemap_engines_search_engine_id() { + if (strpos($_SERVER['HTTP_USER_AGENT'], 'Googlebot') !== FALSE) { + return 'Google'; + } + return $_SERVER['HTTP_USER_AGENT']; +} + +/** + * Helper function for xmlsitemap_engines_ping_sitemap(). + * Submit the sitemap to the engine passed as argument, and write a message in + * Drupal log. + * + * @param $engine + * The identifier for the search engine. + * @param $url_var + * The variable name containing the submission URL used by the search engine. + * @param $default_url + * The default submission URL. + */ +function xmlsitemap_engines_submit_sitemap($engine, $url_var, $default_url) { + $url = strtr( + variable_get($url_var, $default_url), + array('[sitemap]' => url('sitemap.xml', array('absolute' => TRUE))) + ); + $result = drupal_http_request($url); + if ($result->code == 200) { + watchdog('xmlsitemap', 'Sitemap successfully submitted to !engine.', + array('!engine' => $engine) + ); + } + else { + watchdog('xmlsitemap', 'Error occurred submitting sitemap to !engine: !code', + array('!engine' => $engine, '!code' => 0 + $result->code), WATCHDOG_ERROR + ); + } +} +/** + * @} End of "addtogroup xmlsitemap". + */ diff -upNr -x CVS -x CHANGELOG.txt -x '.#*' -I '.*\$Id.*' xmlsitemap-DRUPAL-6--1/xmlsitemap_menu/translations/fr.po xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_menu/translations/fr.po --- xmlsitemap-DRUPAL-6--1/xmlsitemap_menu/translations/fr.po 1969-12-31 19:00:00 -0500 +++ xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_menu/translations/fr.po 2009-04-01 05:38:25 -0400 @@ -0,0 +1,87 @@ +# $Id: fr.po,v 1.1.2.1 2009/04/01 09:38:25 slybud Exp $ +# +# French translation of Drupal (general) +# Copyright YEAR NAME +# 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 \n" +"Language-Team: Sylvain Moreau, OWS \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 menu administration 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'administration des menus. 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 XML Sitemap: Menu looks for the menus to add to the sitemap." +msgstr "Le menu dans lequel XML Sitemap : Menu 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." + diff -upNr -x CVS -x CHANGELOG.txt -x '.#*' -I '.*\$Id.*' xmlsitemap-DRUPAL-6--1/xmlsitemap_menu/translations/xmlsitemap_menu.pot xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_menu/translations/xmlsitemap_menu.pot --- xmlsitemap-DRUPAL-6--1/xmlsitemap_menu/translations/xmlsitemap_menu.pot 1969-12-31 19:00:00 -0500 +++ xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_menu/translations/xmlsitemap_menu.pot 2009-04-25 19:01:00 -0400 @@ -0,0 +1,78 @@ +# $Id: xmlsitemap_menu.pot,v 1.1.2.3 2009/04/25 23:01:00 kiam Exp $ +# +# LANGUAGE translation of Drupal (general) +# Copyright YEAR NAME +# 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 \n" +"Language-Team: LANGUAGE \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 menu administration 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 XML Sitemap: Menu 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 "" + diff -upNr -x CVS -x CHANGELOG.txt -x '.#*' -I '.*\$Id.*' xmlsitemap-DRUPAL-6--1/xmlsitemap_menu/xmlsitemap_menu.info xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_menu/xmlsitemap_menu.info --- xmlsitemap-DRUPAL-6--1/xmlsitemap_menu/xmlsitemap_menu.info 1969-12-31 19:00:00 -0500 +++ xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_menu/xmlsitemap_menu.info 2009-05-07 15:16:30 -0400 @@ -0,0 +1,7 @@ +; $Id: xmlsitemap_menu.info,v 1.1.4.7 2009/05/07 16:01:33 kiam Exp $ +name = XML sitemap menu +description = Add specified menu item links to the sitemap. +package = XML sitemap +dependencies[] = menu +dependencies[] = xmlsitemap +core = "6.x" diff -upNr -x CVS -x CHANGELOG.txt -x '.#*' -I '.*\$Id.*' xmlsitemap-DRUPAL-6--1/xmlsitemap_menu/xmlsitemap_menu.install xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_menu/xmlsitemap_menu.install --- xmlsitemap-DRUPAL-6--1/xmlsitemap_menu/xmlsitemap_menu.install 1969-12-31 19:00:00 -0500 +++ xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_menu/xmlsitemap_menu.install 2009-05-07 08:59:31 -0400 @@ -0,0 +1,147 @@ +XML sitemap menu 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 XML sitemap menu 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 XML sitemap menu 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\_%'"); +} diff -upNr -x CVS -x CHANGELOG.txt -x '.#*' -I '.*\$Id.*' xmlsitemap-DRUPAL-6--1/xmlsitemap_menu/xmlsitemap_menu.module xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_menu/xmlsitemap_menu.module --- xmlsitemap-DRUPAL-6--1/xmlsitemap_menu/xmlsitemap_menu.module 1969-12-31 19:00:00 -0500 +++ xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_menu/xmlsitemap_menu.module 2009-05-07 08:59:31 -0400 @@ -0,0 +1,156 @@ + '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 '
'. t('XML sitemap menu') .'
'. + '
'. 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 menu administration page. The priority of a menu item is determined by its weight.', array('@menu' => url('admin/build/menu'))) .'
'; +} + +/** + * 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". + */ diff -upNr -x CVS -x CHANGELOG.txt -x '.#*' -I '.*\$Id.*' xmlsitemap-DRUPAL-6--1/xmlsitemap_node/translations/fr.po xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_node/translations/fr.po --- xmlsitemap-DRUPAL-6--1/xmlsitemap_node/translations/fr.po 1969-12-31 19:00:00 -0500 +++ xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_node/translations/fr.po 2009-04-01 05:38:25 -0400 @@ -0,0 +1,170 @@ +# $Id: fr.po,v 1.1.2.1 2009/04/01 09:38:25 slybud Exp $ +# +# French translation of Drupal (general) +# Copyright YEAR NAME +# 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_node drupal6 module\n" +"POT-Creation-Date: 2009-04-01 11:08+0200\n" +"PO-Revision-Date: 2009-04-01 11:10+0100\n" +"Last-Translator: Sylvain Moreau \n" +"Language-Team: Sylvain Moreau, OWS \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_node.module:68;98;119;249 +msgid "XML site map" +msgstr "Plan du site XML" + +#: xmlsitemap_node.module:74;256 +msgid "User posts threshold" +msgstr "Seuil de publications utilisateur" + +#: xmlsitemap_node.module:75;257 +msgid "The number of posts a user must author before his posts are added to the site map." +msgstr "Le nombre de publications qu'un utilisateur doit créer avant que ses publications ne soient ajoutées au pln du site." + +#: xmlsitemap_node.module:75 +msgid "This is the default value used for the users for which the post threshold has not been set." +msgstr "Ceci est la valeur par défaut pour les utilisateurs pour lesquels le seuil de publications n'a pas été défini." + +#: xmlsitemap_node.module:78;260 +msgid "1" +msgstr "1" + +#: xmlsitemap_node.module:79;261 +msgid "5" +msgstr "5" + +#: xmlsitemap_node.module:80;262 +msgid "10" +msgstr "10" + +#: xmlsitemap_node.module:81;263 +msgid "20" +msgstr "20" + +#: xmlsitemap_node.module:82;264 +msgid "50" +msgstr "50" + +#: xmlsitemap_node.module:83;265 +msgid "100" +msgstr "100" + +#: xmlsitemap_node.module:84;266 +msgid "200" +msgstr "200" + +#: xmlsitemap_node.module:85;267 +msgid "500" +msgstr "500" + +#: xmlsitemap_node.module:86;268 +msgid "Never add the posts" +msgstr "Ne jamais ajouter les contenus" + +#: xmlsitemap_node.module:105 +msgid "Priority adjustment" +msgstr "Ajustement de priorité" + +#: xmlsitemap_node.module:106 +msgid "This number will be added to the priority of this content type." +msgstr "Ce nombre sera ajouté à la priorité de ce type de contenu." + +#: xmlsitemap_node.module:129 +msgid "Priority" +msgstr "Priorité" + +#: xmlsitemap_node.module:130 +msgid "The default priority is %priority." +msgstr "La priorité par défaut est %priority." + +#: xmlsitemap_node.module:150 +msgid "Add the selected posts to the XML site map" +msgstr "Ajoute les contenus sélectionnés au plan du site XML" + +#: xmlsitemap_node.module:155 +msgid "Change the XML site map priority of the selected posts to default" +msgstr "Modifier à la valeur par défaut la priorité dans le plan du site XML des publications selectionnées" + +#: xmlsitemap_node.module:160 +msgid "Remove the selected posts from the XML site map" +msgstr "Supprime les publications sélectionnées du plan du site XML" + +#: xmlsitemap_node.module:292 +#: xmlsitemap_node.info:0 +msgid "XML Sitemap: Node" +msgstr "XML Sitemap : Node" + +#: xmlsitemap_node.module:293 +msgid "XML Sitemap: Node adds nodes (content) to the site map. The default priority of a node is determined by a combination of its content type priority, whether it appears on the front page of your site, and the number of comments it has received. You can override the default priority for individual nodes when you add or edit a node." +msgstr "XML Sitemap : Node ajoute des noeuds (contenu) au plan du site. La priorité par défaut d'un noeud est déterminée en fonction d'une combinaison de la priorité de son type de contenu, le fait qu'il apparaisse sur la page d'accueil de votre site, et du nombre de commentaires qu'il a reçu. Vous pouvez remplacer la priorité par défaut pour chaue noeud, lors de son ajout ou de son édition." + +#: xmlsitemap_node.module:350 +msgid "Promotion adjustment" +msgstr "Ajustement de promotion" + +#: xmlsitemap_node.module:351 +msgid "This number will be added to the priority of each post that is promoted to the front page. This setting doesn't apply for the nodes for which the priority is overriden." +msgstr "Ce nombre sera ajouté à la priorité de chaque contenu promu en page d'accueil. Ce paramètre ne s'applique pas aux noeuds dont la priorité est remplacée." + +#: xmlsitemap_node.module:357 +msgid "Comment ratio weight - nodes" +msgstr "Poids de ratio des commentaires - noeuds" + +#: xmlsitemap_node.module:358 +msgid "This number will be added to the priority of the post with the highest number of comments; for the other posts, the number is calculated proportionally to the number of comments. This doesn't apply if the maximum number of comments is one, nor for the nodes for which the priority is overriden." +msgstr "Ce nombre sera ajouté à la priorité du contenu avec le plus grand nombre de commentaires; pour les autres contenus, le nombre est calculé proportionnellement au nombre de commentaires. Ce paramètre ne s'applique pas si le nombre maximal de commentaites est un, ni aux noeuds dont la priorité est remplacée." + +#: xmlsitemap_node.module:389 +msgid "Processing" +msgstr "Exécution" + +#: xmlsitemap_node.module:391 +msgid "The update has encountered an error." +msgstr "La mise à jour a échoué." + +#: xmlsitemap_node.module:0 +msgid "xmlsitemap_node" +msgstr "xmlsitemap_node" + +#: xmlsitemap_node.install:470 +msgid "Updating %title" +msgstr "Mise à jour de %title" + +#: xmlsitemap_node.info:0 +msgid "Adds nodes to the site map." +msgstr "Ajoute les noeuds au plan du site." + +#: xmlsitemap_node.info:0 +msgid "XML Sitemap" +msgstr "XML Sitemap" + diff -upNr -x CVS -x CHANGELOG.txt -x '.#*' -I '.*\$Id.*' xmlsitemap-DRUPAL-6--1/xmlsitemap_node/translations/xmlsitemap_node.de.po xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_node/translations/xmlsitemap_node.de.po --- xmlsitemap-DRUPAL-6--1/xmlsitemap_node/translations/xmlsitemap_node.de.po 2009-06-05 19:43:29 -0400 +++ xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_node/translations/xmlsitemap_node.de.po 1969-12-31 19:00:00 -0500 @@ -1,62 +0,0 @@ -# $Id: xmlsitemap_node.de.po,v 1.1.2.2 2009/06/05 23:43:29 hass Exp $ -# -# LANGUAGE translation of Drupal (gsitemap.module) -# Copyright YEAR NAME -# Generated from files: -# gsitemap.module,v 1.56.2.7 2007/03/18 21:55:39 darrenoh -# gsitemap.info,v 1.3.2.3 2007/02/13 15:57:06 darrenoh -# -msgid "" -msgstr "" -"Project-Id-Version: German translation of xmlsitemap_node\n" -"POT-Creation-Date: 2009-06-06 01:06+0200\n" -"PO-Revision-Date: 2009-06-06 01:21+0100\n" -"Last-Translator: Alexander Haß\n" -"Language-Team: Alexander Hass\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: German\n" -"X-Poedit-Country: GERMANY\n" -"X-Poedit-SourceCharset: utf-8\n" - -#: xmlsitemap_node/xmlsitemap_node.module:88 -msgid "Priority adjustment" -msgstr "Prioritätsanpassung" - -#: xmlsitemap_node/xmlsitemap_node.module:89 -msgid "This number will be added to the priority of this content type." -msgstr "Diese Zahl wird der Priorität dieses Inhaltstypen hinzugefügt." - -#: xmlsitemap_node/xmlsitemap_node.module:103 -msgid "Node settings" -msgstr "Beitragseinstellungen" - -#: xmlsitemap_node/xmlsitemap_node.module:109 -#, fuzzy -msgid "Promotion priority adjustment" -msgstr "Promotionanpassung der Priorität" - -#: xmlsitemap_node/xmlsitemap_node.module:110 -#, fuzzy -msgid "This number will be added to the priority of each post that is promoted to the front page. This setting doesn't apply for the nodes for which the priority is overriden." -msgstr "Dieser Wert wird der Priorität jedes Beitrages hinzugefügt, welcher auf der Startseite beworben wird. Diese Einstellung wird nicht bei Beiträgen angewendet, deren Priorität übersteuert wird." - -#: xmlsitemap_node/xmlsitemap_node.module:164 -#: xmlsitemap_node/xmlsitemap_node.info:0 -msgid "XML sitemap node" -msgstr "XML-Sitemap - Beitrag" - -#: xmlsitemap_node/xmlsitemap_node.module:165 -msgid "XML sitemap node adds nodes (content) to the sitemap. The default priority of a node is determined by a combination of its content type priority, and whether it appears on the front page of your site. You can override the default priority for individual nodes when you add or edit a node." -msgstr "" - -#: xmlsitemap_node/xmlsitemap_node.module:0 -msgid "xmlsitemap_node" -msgstr "xmlsitemap_node" - -#: xmlsitemap_node/xmlsitemap_node.info:0 -msgid "Add node links to the sitemap." -msgstr "Fügt Links von Beiträgen in die Sitemap ein." - diff -upNr -x CVS -x CHANGELOG.txt -x '.#*' -I '.*\$Id.*' xmlsitemap-DRUPAL-6--1/xmlsitemap_node/translations/xmlsitemap_node.fr.po xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_node/translations/xmlsitemap_node.fr.po --- xmlsitemap-DRUPAL-6--1/xmlsitemap_node/translations/xmlsitemap_node.fr.po 2009-06-05 18:07:57 -0400 +++ xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_node/translations/xmlsitemap_node.fr.po 1969-12-31 19:00:00 -0500 @@ -1,170 +0,0 @@ -# $Id: xmlsitemap_node.fr.po,v 1.1.2.1 2009/06/05 22:07:57 hass Exp $ -# -# French translation of Drupal (general) -# Copyright YEAR NAME -# 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_node drupal6 module\n" -"POT-Creation-Date: 2009-04-01 11:08+0200\n" -"PO-Revision-Date: 2009-04-01 11:10+0100\n" -"Last-Translator: Sylvain Moreau \n" -"Language-Team: Sylvain Moreau, OWS \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_node.module:68;98;119;249 -msgid "XML site map" -msgstr "Plan du site XML" - -#: xmlsitemap_node.module:74;256 -msgid "User posts threshold" -msgstr "Seuil de publications utilisateur" - -#: xmlsitemap_node.module:75;257 -msgid "The number of posts a user must author before his posts are added to the site map." -msgstr "Le nombre de publications qu'un utilisateur doit créer avant que ses publications ne soient ajoutées au pln du site." - -#: xmlsitemap_node.module:75 -msgid "This is the default value used for the users for which the post threshold has not been set." -msgstr "Ceci est la valeur par défaut pour les utilisateurs pour lesquels le seuil de publications n'a pas été défini." - -#: xmlsitemap_node.module:78;260 -msgid "1" -msgstr "1" - -#: xmlsitemap_node.module:79;261 -msgid "5" -msgstr "5" - -#: xmlsitemap_node.module:80;262 -msgid "10" -msgstr "10" - -#: xmlsitemap_node.module:81;263 -msgid "20" -msgstr "20" - -#: xmlsitemap_node.module:82;264 -msgid "50" -msgstr "50" - -#: xmlsitemap_node.module:83;265 -msgid "100" -msgstr "100" - -#: xmlsitemap_node.module:84;266 -msgid "200" -msgstr "200" - -#: xmlsitemap_node.module:85;267 -msgid "500" -msgstr "500" - -#: xmlsitemap_node.module:86;268 -msgid "Never add the posts" -msgstr "Ne jamais ajouter les contenus" - -#: xmlsitemap_node.module:105 -msgid "Priority adjustment" -msgstr "Ajustement de priorité" - -#: xmlsitemap_node.module:106 -msgid "This number will be added to the priority of this content type." -msgstr "Ce nombre sera ajouté à la priorité de ce type de contenu." - -#: xmlsitemap_node.module:129 -msgid "Priority" -msgstr "Priorité" - -#: xmlsitemap_node.module:130 -msgid "The default priority is %priority." -msgstr "La priorité par défaut est %priority." - -#: xmlsitemap_node.module:150 -msgid "Add the selected posts to the XML site map" -msgstr "Ajoute les contenus sélectionnés au plan du site XML" - -#: xmlsitemap_node.module:155 -msgid "Change the XML site map priority of the selected posts to default" -msgstr "Modifier à la valeur par défaut la priorité dans le plan du site XML des publications selectionnées" - -#: xmlsitemap_node.module:160 -msgid "Remove the selected posts from the XML site map" -msgstr "Supprime les publications sélectionnées du plan du site XML" - -#: xmlsitemap_node.module:292 -#: xmlsitemap_node.info:0 -msgid "XML Sitemap: Node" -msgstr "XML Sitemap : Node" - -#: xmlsitemap_node.module:293 -msgid "XML Sitemap: Node adds nodes (content) to the site map. The default priority of a node is determined by a combination of its content type priority, whether it appears on the front page of your site, and the number of comments it has received. You can override the default priority for individual nodes when you add or edit a node." -msgstr "XML Sitemap : Node ajoute des noeuds (contenu) au plan du site. La priorité par défaut d'un noeud est déterminée en fonction d'une combinaison de la priorité de son type de contenu, le fait qu'il apparaisse sur la page d'accueil de votre site, et du nombre de commentaires qu'il a reçu. Vous pouvez remplacer la priorité par défaut pour chaue noeud, lors de son ajout ou de son édition." - -#: xmlsitemap_node.module:350 -msgid "Promotion adjustment" -msgstr "Ajustement de promotion" - -#: xmlsitemap_node.module:351 -msgid "This number will be added to the priority of each post that is promoted to the front page. This setting doesn't apply for the nodes for which the priority is overriden." -msgstr "Ce nombre sera ajouté à la priorité de chaque contenu promu en page d'accueil. Ce paramètre ne s'applique pas aux noeuds dont la priorité est remplacée." - -#: xmlsitemap_node.module:357 -msgid "Comment ratio weight - nodes" -msgstr "Poids de ratio des commentaires - noeuds" - -#: xmlsitemap_node.module:358 -msgid "This number will be added to the priority of the post with the highest number of comments; for the other posts, the number is calculated proportionally to the number of comments. This doesn't apply if the maximum number of comments is one, nor for the nodes for which the priority is overriden." -msgstr "Ce nombre sera ajouté à la priorité du contenu avec le plus grand nombre de commentaires; pour les autres contenus, le nombre est calculé proportionnellement au nombre de commentaires. Ce paramètre ne s'applique pas si le nombre maximal de commentaites est un, ni aux noeuds dont la priorité est remplacée." - -#: xmlsitemap_node.module:389 -msgid "Processing" -msgstr "Exécution" - -#: xmlsitemap_node.module:391 -msgid "The update has encountered an error." -msgstr "La mise à jour a échoué." - -#: xmlsitemap_node.module:0 -msgid "xmlsitemap_node" -msgstr "xmlsitemap_node" - -#: xmlsitemap_node.install:470 -msgid "Updating %title" -msgstr "Mise à jour de %title" - -#: xmlsitemap_node.info:0 -msgid "Adds nodes to the site map." -msgstr "Ajoute les noeuds au plan du site." - -#: xmlsitemap_node.info:0 -msgid "XML Sitemap" -msgstr "XML Sitemap" - diff -upNr -x CVS -x CHANGELOG.txt -x '.#*' -I '.*\$Id.*' xmlsitemap-DRUPAL-6--1/xmlsitemap_node/translations/xmlsitemap_node.pot xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_node/translations/xmlsitemap_node.pot --- xmlsitemap-DRUPAL-6--1/xmlsitemap_node/translations/xmlsitemap_node.pot 2009-06-06 12:58:39 -0400 +++ xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_node/translations/xmlsitemap_node.pot 2009-04-25 19:01:01 -0400 @@ -1,16 +1,17 @@ -# $Id: xmlsitemap_node.pot,v 1.1.2.4 2009/06/05 23:08:44 hass Exp $ +# $Id: xmlsitemap_node.pot,v 1.1.2.3 2009/04/25 23:01:01 kiam Exp $ # -# LANGUAGE translation of Drupal (xmlsitemap_node) +# LANGUAGE translation of Drupal (general) # Copyright YEAR NAME # Generated from files: -# xmlsitemap_node.module,v 1.19.2.122 2009/05/26 11:03:49 kiam -# xmlsitemap_node.info,v 1.2.2.4 2009/05/05 21:53:44 earnie +# xmlsitemap_node.rules.inc,v 1.1.2.4 2009/04/25 22:21:10 kiam +# xmlsitemap_node.module,v 1.19.2.92 2009/04/24 18:26:06 kiam +# xmlsitemap_node.info,v 1.2.2.3 2009/04/24 18:33:52 kiam # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2009-06-06 01:06+0200\n" +"POT-Creation-Date: 2009-04-26 00:54+0200\n" "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" "Last-Translator: NAME \n" "Language-Team: LANGUAGE \n" @@ -19,39 +20,143 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: xmlsitemap_node/xmlsitemap_node.module:88 +#: xmlsitemap_node.rules.inc:24 +msgid "Remove the content from the site map" +msgstr "" + +#: xmlsitemap_node.rules.inc:26;33;40 +msgid "Content" +msgstr "" + +#: xmlsitemap_node.rules.inc:31 +msgid "Set the site map content priority to the content type value" +msgstr "" + +#: xmlsitemap_node.rules.inc:38 +msgid "Set the site map content priority" +msgstr "" + +#: xmlsitemap_node.rules.inc:41 xmlsitemap_node.module:78 +msgid "Priority" +msgstr "" + +#: xmlsitemap_node.module:68;95;118 +msgid "XML site map" +msgstr "" + +#: xmlsitemap_node.module:79 +msgid "The default priority is %priority." +msgstr "" + +#: xmlsitemap_node.module:102 msgid "Priority adjustment" msgstr "" -#: xmlsitemap_node/xmlsitemap_node.module:89 +#: xmlsitemap_node.module:103 msgid "This number will be added to the priority of this content type." msgstr "" -#: xmlsitemap_node/xmlsitemap_node.module:103 -msgid "Node settings" +#: xmlsitemap_node.module:124;268 +msgid "User posts threshold" +msgstr "" + +#: xmlsitemap_node.module:125;269 +msgid "The number of posts a user must author before his posts are added to the site map." +msgstr "" + +#: xmlsitemap_node.module:125 +msgid "This is the default value used for the users for which the post threshold has not been set." +msgstr "" + +#: xmlsitemap_node.module:128;272 +msgid "1" +msgstr "" + +#: xmlsitemap_node.module:129;273 +msgid "5" +msgstr "" + +#: xmlsitemap_node.module:130;274 +msgid "10" +msgstr "" + +#: xmlsitemap_node.module:131;275 +msgid "20" msgstr "" -#: xmlsitemap_node/xmlsitemap_node.module:109 -msgid "Promotion priority adjustment" +#: xmlsitemap_node.module:132;276 +msgid "50" msgstr "" -#: xmlsitemap_node/xmlsitemap_node.module:110 +#: xmlsitemap_node.module:133;277 +msgid "100" +msgstr "" + +#: xmlsitemap_node.module:134;278 +msgid "200" +msgstr "" + +#: xmlsitemap_node.module:135;279 +msgid "500" +msgstr "" + +#: xmlsitemap_node.module:136;280 +msgid "Never add the posts" +msgstr "" + +#: xmlsitemap_node.module:151 +msgid "Promotion adjustment" +msgstr "" + +#: xmlsitemap_node.module:152 msgid "This number will be added to the priority of each post that is promoted to the front page. This setting doesn't apply for the nodes for which the priority is overriden." msgstr "" -#: xmlsitemap_node/xmlsitemap_node.module:164 xmlsitemap_node/xmlsitemap_node.info:0 -msgid "XML sitemap node" +#: xmlsitemap_node.module:158 +msgid "Comment ratio weight - nodes" +msgstr "" + +#: xmlsitemap_node.module:159 +msgid "This number will be added to the priority of the post with the highest number of comments; for the other posts, the number is calculated proportionally to the number of comments. This doesn't apply if the maximum number of comments is one, nor for the nodes for which the priority is overriden." +msgstr "" + +#: xmlsitemap_node.module:171 +msgid "Add the selected posts to the XML site map" +msgstr "" + +#: xmlsitemap_node.module:176 +msgid "Change the XML site map priority of the selected posts to default" +msgstr "" + +#: xmlsitemap_node.module:181 +msgid "Remove the selected posts from the XML site map" +msgstr "" + +#: xmlsitemap_node.module:304 xmlsitemap_node.info:0 +msgid "XML Sitemap: Node" msgstr "" -#: xmlsitemap_node/xmlsitemap_node.module:165 -msgid "XML sitemap node adds nodes (content) to the sitemap. The default priority of a node is determined by a combination of its content type priority, and whether it appears on the front page of your site. You can override the default priority for individual nodes when you add or edit a node." +#: xmlsitemap_node.module:305 +msgid "XML Sitemap: Node adds nodes (content) to the site map. The default priority of a node is determined by a combination of its content type priority, whether it appears on the front page of your site, and the number of comments it has received. You can override the default priority for individual nodes when you add or edit a node." msgstr "" -#: xmlsitemap_node/xmlsitemap_node.module:0 +#: xmlsitemap_node.module:439 +msgid "Processing" +msgstr "" + +#: xmlsitemap_node.module:441 +msgid "The update has encountered an error." +msgstr "" + +#: xmlsitemap_node.module:0 msgid "xmlsitemap_node" msgstr "" -#: xmlsitemap_node/xmlsitemap_node.info:0 -msgid "Add node links to the sitemap." +#: xmlsitemap_node.info:0 +msgid "Adds nodes to the site map." +msgstr "" + +#: xmlsitemap_node.info:0 +msgid "XML Sitemap" msgstr "" diff -upNr -x CVS -x CHANGELOG.txt -x '.#*' -I '.*\$Id.*' xmlsitemap-DRUPAL-6--1/xmlsitemap_node/xmlsitemap_node.install xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_node/xmlsitemap_node.install --- xmlsitemap-DRUPAL-6--1/xmlsitemap_node/xmlsitemap_node.install 2009-05-25 21:28:49 -0400 +++ xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_node/xmlsitemap_node.install 2009-05-07 08:59:31 -0400 @@ -14,14 +14,14 @@ * Implementation of hook_enable(). */ function xmlsitemap_node_enable() { - xmlsitemap_flag_sitemap(TRUE); + xmlsitemap_flag_sitemap(); } /** * Implementation of hook_disable(). */ function xmlsitemap_node_disable() { - xmlsitemap_flag_sitemap(TRUE); + xmlsitemap_flag_sitemap(); } /** @@ -29,40 +29,22 @@ function xmlsitemap_node_disable() { */ function xmlsitemap_node_schema() { $schema['xmlsitemap_node'] = array( - 'description' => 'The list of the nodes added to the sitemap.', + 'description' => 'The base table for xmlsitemap_node.', 'fields' => array( - 'mid' => array( - 'description' => 'The primary key.', - 'type' => 'serial', - 'not null' => TRUE, - ), - 'pdata' => array( + 'nid' => array( 'description' => 'The node ID.', 'type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0, ), - 'sdata' => array( - 'description' => 'The revision ID.', + 'changed' => array( + 'description' => 'The Unix timestamp of the last change.', 'type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0, ), - 'language' => array( - 'description' => 'The language associated with the node.', - 'type' => 'varchar', - 'length' => 12, - 'not null' => TRUE, - 'default' => '', - ), - 'status' => array( - 'description' => 'Boolean indicating whether or not this node is enabled.', - 'type' => 'int', - 'not null' => TRUE, - 'default' => 1, - ), 'previously_changed' => array( 'description' => 'The Unix timestamp of the previous change.', 'type' => 'int', @@ -70,37 +52,22 @@ function xmlsitemap_node_schema() { 'not null' => TRUE, 'default' => 0, ), - 'changed' => array( - 'description' => 'The Unix timestamp of the last change.', - 'type' => 'int', - 'unsigned' => TRUE, - 'not null' => TRUE, - 'default' => 0, - ), - 'priority' => array( - 'description' => 'The priority of the node in the sitemap.', + 'comment_ratio' => array( + 'description' => 'The ratio between the node comments and the maximum number of comments added to a node.', 'type' => 'float', 'not null' => TRUE, - 'default' => 0.5, + 'default' => 0.0, ), 'priority_override' => array( - 'description' => 'The value that overrides the normal priority.', + 'description' => 'The priority of the node in the sitemap.', 'type' => 'float', 'not null' => TRUE, 'default' => -2.0, ), ), - 'indexes' => array( - 'link_language' => array('language'), - 'link_status' => array('status'), - 'link_changed' => array('changed'), - 'link_priority' => array('priority'), - ), - 'unique keys' => array( - 'link_pdata' => array('pdata'), - ), - 'primary key' => array('mid'), + 'primary key' => array('nid'), ); + return $schema; } @@ -119,10 +86,169 @@ function xmlsitemap_node_install() { function xmlsitemap_node_update_6000() { $ret = array(); if (db_table_exists('xmlsitemap_node')) { - db_drop_table($ret, 'xmlsitemap_node'); + if (db_column_exists('xmlsitemap_node', 'pid')) { + $result = array(); + @db_drop_index($result, 'xmlsitemap_node', 'pid'); + if ($result[0]['success']) { + $ret[] = $result[0]; + } + db_drop_field($ret, 'xmlsitemap_node', 'pid'); + } + if (db_column_exists('xmlsitemap_node', 'nid')) { + $result = array(); + @db_drop_primary_key($result, 'xmlsitemap_node'); + if ($result[0]['success']) { + $ret[] = $result[0]; + } + db_change_field($ret, 'xmlsitemap_node', 'nid', 'nid', + array( + 'description' => 'The node ID.', + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ), + array('primary key' => array('nid')) + ); + } + else { + db_add_field($ret, 'xmlsitemap_node', 'nid', + array( + 'description' => 'The node ID.', + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ), + array('primary key' => array('nid')) + ); + } + if (db_column_exists('xmlsitemap_node', 'vid')) { + db_drop_field($ret, 'xmlsitemap_node', 'vid'); + } + if (db_column_exists('xmlsitemap_node', 'last_changed')) { + db_change_field($ret, 'xmlsitemap_node', 'last_changed', 'changed', + array( + 'description' => 'The Unix timestamp of the last change.', + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ) + ); + } + else { + if (db_column_exists('xmlsitemap_node', 'changed')) { + db_change_field($ret, 'xmlsitemap_node', 'changed', 'changed', + array( + 'description' => 'The Unix timestamp of the last change.', + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ) + ); + } + else { + db_add_field($ret, 'xmlsitemap_node', 'changed', + array( + 'description' => 'The Unix timestamp of the last change.', + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ) + ); + } + } + if (db_column_exists('xmlsitemap_node', 'last_comment')) { + db_drop_field($ret, 'xmlsitemap_node', 'last_comment'); + } + if (db_column_exists('xmlsitemap_node', 'previous_comment')) { + db_drop_field($ret, 'xmlsitemap_node', 'previous_comment'); + } + if (!db_column_exists('xmlsitemap_node', 'comment_ratio')) { + db_add_field($ret, 'xmlsitemap_node', 'comment_ratio', + array( + 'description' => 'The ratio between the node comments and the maximum number of comments added to a node.', + 'type' => 'float', + 'not null' => TRUE, + 'default' => 0.0, + ) + ); + } + else { + db_change_field($ret, 'xmlsitemap_node', 'comment_ratio', 'comment_ratio', + array( + 'description' => 'The ratio between the node comments and the maximum number of comments added to a node.', + 'type' => 'float', + 'not null' => TRUE, + 'default' => 0.0, + ) + ); + } + $ret[] = update_sql("UPDATE {xmlsitemap_node} + SET priority_override = -2.0 + WHERE priority_override IS NULL" + ); + db_change_field($ret, 'xmlsitemap_node', 'priority_override', 'priority_override', + array( + 'description' => 'The priority of the node in the sitemap.', + 'type' => 'float', + 'not null' => TRUE, + 'default' => -2.0, + ) + ); + } + else { + db_create_table($ret, 'xmlsitemap_node', + array( + 'description' => 'The base table for xmlsitemap_node.', + 'fields' => array( + 'nid' => array( + 'description' => 'The node ID.', + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ), + 'changed' => array( + 'description' => 'The Unix timestamp of the last change.', + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ), + 'previously_changed' => array( + 'description' => 'The Unix timestamp of the previous change.', + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ), + 'comment_ratio' => array( + 'description' => 'The ratio between the node comments and the maximum number of comments added to a node.', + 'type' => 'float', + 'not null' => TRUE, + 'default' => 0.0, + ), + 'priority_override' => array( + 'description' => 'The priority of the node in the sitemap.', + 'type' => 'float', + 'not null' => TRUE, + 'default' => -2.0, + ), + ), + 'primary key' => array('nid'), + ) + ); } - foreach(xmlsitemap_node_schema() as $table => $definition) { - db_create_table($ret, $table, $definition); + if (variable_get('xmlsitemap_node_comment_priority', 0.5) == 0.5) { + variable_set('xmlsitemap_node_comment_priority', 0.2); + $ret[] = array( + 'success' => TRUE, + 'query' => 'UPDATE MODULE SETTINGS', + ); } return $ret; } @@ -131,6 +257,54 @@ function xmlsitemap_node_update_6000() { * Implementation of hook_update_N(). * */ +function xmlsitemap_node_update_6100() { + return array(); +} + +/** + * Implementation of hook_update_N(). + * + */ +function xmlsitemap_node_update_6101() { + return array(); +} + +/** + * Implementation of hook_update_N(). + * + */ +function xmlsitemap_node_update_6102() { + return array(); +} + +/** + * Implementation of hook_update_N(). + * + */ +function xmlsitemap_node_update_6103() { + return array(); +} + +/** + * Implementation of hook_update_N(). + * + */ +function xmlsitemap_node_update_6104() { + return array(); +} + +/** + * Implementation of hook_update_N(). + * + */ +function xmlsitemap_node_update_6105() { + return array(); +} + +/** + * Implementation of hook_update_N(). + * + */ function xmlsitemap_node_update_6106() { $ret[] = update_sql("UPDATE {system} SET weight = 5 WHERE name = 'xmlsitemap_node'"); return $ret; @@ -140,11 +314,107 @@ function xmlsitemap_node_update_6106() { * Implementation of hook_update_N(). * */ -function xmlsitemap_node_update_6121() { +function xmlsitemap_node_update_6107() { + return array(); +} + +/** + * Implementation of hook_update_N(). + * + */ +function xmlsitemap_node_update_6108() { + return array(); +} + +/** + * Implementation of hook_update_N(). + * + */ +function xmlsitemap_node_update_6109() { + return array(); +} + +/** + * Implementation of hook_update_N(). + * + */ +function xmlsitemap_node_update_6110() { + return array(); +} + +/** + * Implementation of hook_update_N(). + * + */ +function xmlsitemap_node_update_6111() { + return array(); +} + +/** + * Implementation of hook_update_N(). + * + */ +function xmlsitemap_node_update_6112() { return xmlsitemap_node_update_6000(); } /** + * Implementation of hook_update_N(). + * + */ +function xmlsitemap_node_update_6113() { + return array(); +} + +/** + * Implementation of hook_update_N(). + * + */ +function xmlsitemap_node_update_6114() { + return array(); +} + +/** + * Implementation of hook_update_N(). + * + */ +function xmlsitemap_node_update_6115() { + return array(); +} + +/** + * Implementation of hook_update_N(). + * + */ +function xmlsitemap_node_update_6116() { + return array(); +} + +/** + * Implementation of hook_update_N(). + * + */ +function xmlsitemap_node_update_6117() { + return array(); +} + +/** + * Implementation of hook_update_N(). + * + */ +function xmlsitemap_node_update_6118() { + return array(); +} + +/** + * Implementation of hook_update_N(). + * + */ +function xmlsitemap_node_update_6119() { + return array(); +} + +/** * Implementation of hook_uninstall(). */ function xmlsitemap_node_uninstall() { diff -upNr -x CVS -x CHANGELOG.txt -x '.#*' -I '.*\$Id.*' xmlsitemap-DRUPAL-6--1/xmlsitemap_node/xmlsitemap_node.module xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_node/xmlsitemap_node.module --- xmlsitemap-DRUPAL-6--1/xmlsitemap_node/xmlsitemap_node.module 2009-05-26 22:49:12 -0400 +++ xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_node/xmlsitemap_node.module 2009-05-07 17:03:00 -0400 @@ -16,26 +16,78 @@ ****************************************************************************/ /** + * Implementation of hook_comment(). + */ +function xmlsitemap_node_comment($a1, $op) { + switch ($op) { + case 'insert': + case 'update': + case 'delete': + case 'publish': + case 'unpublish': + $maxcomments = (integer) db_result(db_query('SELECT MAX(comment_count) FROM {node_comment_statistics}')); + if ($nid = is_array($a1) ? $a1['nid'] : $a1->nid) { + if (!($node = node_load($nid))) { + return; + } + $comments = (integer) db_result(db_query('SELECT comment_count + FROM {node_comment_statistics} + WHERE nid = %d', $nid) + ); + $query = "SELECT nid, changed, previously_changed, comment_ratio, priority_override + FROM {xmlsitemap_node} + WHERE nid = %d"; + if (($link = db_fetch_object(db_query($query, $nid))) !== FALSE) { + $row = $link; + if ($node->changed > $row->changed) { + $row->previously_changed = $row->changed; + $row->changed = $node->changed; + } + } + else { + $row = new stdClass(); + $row->nid = $nid; + $row->changed = $node->changed; + $row->previously_changed = $node->created; + } + if ($maxcomments > 1) { + $row->comment_ratio = $comments / $maxcomments; + } + drupal_write_record('xmlsitemap_node', $row, ($link !== FALSE) ? 'nid' : NULL); + } + break; + } +} + +/** * Implementation of hook_cron(). */ function xmlsitemap_node_cron() { - $anonymous_user = drupal_anonymous_user(); - if (user_access('access content', $anonymous_user)) { - $limit = variable_get('xmlsitemap_cron_limit', 200); - $sql = "SELECT n.nid FROM {node} n LEFT JOIN {xmlsitemap_node} xn ON xn.pdata = n.nid WHERE xn.pdata IS NULL ORDER BY n.changed DESC"; + if (($limit = variable_get('xmlsitemap_cron_limit', 100)) != -1) { + $sql = "SELECT n.* FROM {node} n + LEFT JOIN {xmlsitemap_node} xn ON xn.nid = n.nid + WHERE xn.nid IS NULL + AND n.status <> 0"; $result = db_query_range($sql, 0, $limit); - $row = new stdClass(); - while ($nid = db_result($result)) { - if ($node = node_load($nid, NULL, TRUE)) { - $row->pdata = $node->nid; - $row->sdata = $node->vid; - $row->language = $node->language; - $row->status = $node->status && node_access('view', $node, $anonymous_user); - $row->previously_changed = $node->created; - $row->changed = $node->changed; - $row->priority = variable_get('xmlsitemap_node_type_priority_'. $node->type, 0.5); - xmlsitemap_write_link($row, 'xmlsitemap_node'); + while ($node = db_fetch_object($result)) { + if (module_exists('comment')) { + $maxcomments = (integer) db_result(db_query('SELECT MAX(comment_count) FROM {node_comment_statistics}')); + $comments = (integer) db_result(db_query('SELECT comment_count + FROM {node_comment_statistics} + WHERE nid = %d', $node->nid) + ); + } + else { + $maxcomments = 0; + } + $row = new stdClass(); + $row->nid = $node->nid; + $row->changed = $node->changed; + $row->previously_changed = $node->created; + if ($maxcomments > 1) { + $row->comment_ratio = $comments / $maxcomments; } + drupal_write_record('xmlsitemap_node', $row); } } } @@ -51,12 +103,11 @@ function xmlsitemap_node_form_alter(&$fo '#type' => 'fieldset', '#title' => t('XML sitemap'), '#collapsible' => TRUE, - '#collapsed' => TRUE, '#access' => user_access('override node priority') || user_access('administer nodes'), '#weight' => 30, ); } - $options = xmlsitemap_priority_options(TRUE, TRUE); + $options = xmlsitemap_priority_options('both'); $default = variable_get('xmlsitemap_node_type_priority_'. $node->type, '0.5'); $form['xmlsitemap']['priority_override'] = array( '#type' => 'select', @@ -79,7 +130,6 @@ function xmlsitemap_node_form_node_type_ '#type' => 'fieldset', '#title' => t('XML sitemap'), '#collapsible' => TRUE, - '#collapsed' => TRUE, '#weight' => 30, ); } @@ -88,7 +138,7 @@ function xmlsitemap_node_form_node_type_ '#title' => t('Priority adjustment'), '#description' => t('This number will be added to the priority of this content type.'), '#default_value' => variable_get('xmlsitemap_node_type_priority_'. $form['#node_type']->type, 0.5), - '#options' => xmlsitemap_priority_options(TRUE), + '#options' => xmlsitemap_priority_options('exclude'), ); $form['#submit'][] = 'xmlsitemap_node_type_submit'; } @@ -98,9 +148,11 @@ function xmlsitemap_node_form_node_type_ * Implementation of hook_form_FORM_ID_alter(). */ function xmlsitemap_node_form_xmlsitemap_settings_alter(&$form, &$from_state) { + $options = xmlsitemap_priority_options(); $form['xmlsitemap_node'] = array( '#type' => 'fieldset', '#title' => t('Node settings'), + '#description' => t('The settings for the nodes to include in the sitemap.'), '#collapsible' => TRUE, '#weight' => 1, ); @@ -109,11 +161,42 @@ function xmlsitemap_node_form_xmlsitemap '#title' => t('Promotion priority adjustment'), '#description' => t("This number will be added to the priority of each post that is promoted to the front page. This setting doesn't apply for the nodes for which the priority is overriden."), '#default_value' => variable_get('xmlsitemap_node_promote_priority', 0.3), - '#options' => xmlsitemap_priority_options(), + '#options' => $options, + ); + $form['xmlsitemap_node']['xmlsitemap_node_comment_priority'] = array( + '#type' => 'select', + '#title' => t('Comment ratio priority adjustment'), + '#description' => t("This number will be added to the priority of the post with the highest number of comments; for the other posts, the number is calculated proportionally to the number of comments. This doesn't apply if the maximum number of comments is one, nor for the nodes for which the priority is overriden."), + '#default_value' => variable_get('xmlsitemap_node_comment_priority', 0.2), + '#options' => $options, ); } /** + * Implementation of hook_node_operations(). + */ +function xmlsitemap_node_node_operations() { + $operations = array( + 'xmlsitemap_add_nodes' => array( + 'label' => t('Add the selected posts to the XML sitemap'), + 'callback' => '_xmlsitemap_node_priority_operations', + 'callback arguments' => array('priority' => 0.5), + ), + 'xmlsitemap_change_nodes_priority' => array( + 'label' => t('Change the XML sitemap priority of the selected posts to default'), + 'callback' => '_xmlsitemap_node_priority_operations', + 'callback arguments' => array('priority' => -2.0), + ), + 'xmlsitemap_remove_nodes' => array( + 'label' => t('Remove the selected posts from the XML sitemap'), + 'callback' => '_xmlsitemap_node_priority_operations', + 'callback arguments' => array('priority' => -1.0), + ), + ); + return $operations; +} + +/** * Implementation of hook_node_type(). */ function xmlsitemap_node_node_type($op, $info) { @@ -133,26 +216,48 @@ function xmlsitemap_node_nodeapi(&$node, switch ($op) { case 'prepare': if (isset($node->nid)) { - $priority_override = db_result(db_query("SELECT priority_override FROM {xmlsitemap_node} WHERE mid = %d", $node->nid)); + $priority_override = db_result(db_query("SELECT priority_override + FROM {xmlsitemap_node} WHERE nid = %d", + $node->nid) + ); $node->priority_override = $priority_override !== FALSE ? $priority_override : -2.0; } break; case 'insert': - case 'update': $row = new stdClass(); - $row->pdata = $node->nid; - $row->sdata = $node->vid; - $row->status = $node->status && node_access('view', $node, drupal_anonymous_user()); - $row->previously_changed = $node->created; + $row->nid = $node->nid; $row->changed = $node->changed; - $row->language = $node->language; - $row->priority = isset($node->type) ? variable_get('xmlsitemap_node_type_priority_'. $node->type, 0.5) : 0.5; + $row->previously_changed = $node->created; $row->priority_override = isset($node->priority_override) ? $node->priority_override : -2.0; - xmlsitemap_write_link($row, 'xmlsitemap_node'); + drupal_write_record('xmlsitemap_node', $row); + if ($node->status) { + xmlsitemap_flag_sitemap(); + } + break; + case 'update': + if (($result = db_fetch_object(db_query("SELECT nid, changed, previously_changed, comment_ratio, priority_override FROM {xmlsitemap_node} WHERE nid = %d", $node->nid))) === FALSE) { + $row = new stdClass(); + $row->nid = $node->nid; + $row->changed = $node->changed; + $row->previously_changed = $node->created; + $row->priority_override = isset($node->priority_override) ? $node->priority_override : -2.0; + } + else { + $row = $result; + $row->previously_changed = $row->changed; + $row->changed = $node->changed; + if (isset($node->priority_override)) { + $row->priority_override = $node->priority_override; + } + } + drupal_write_record('xmlsitemap_node', $row, $result === FALSE ? NULL : 'nid'); + xmlsitemap_flag_sitemap(); break; case 'delete': - db_query("DELETE FROM {xmlsitemap_node} WHERE mid = %d", $node->nid); - xmlsitemap_flag_sitemap(TRUE); + db_query("DELETE FROM {xmlsitemap_node} WHERE nid = %d", $node->nid); + if ($node->status) { + xmlsitemap_flag_sitemap(); + } break; } } @@ -162,29 +267,51 @@ function xmlsitemap_node_nodeapi(&$node, */ function xmlsitemap_node_xmlsitemap_description() { return '
'. t('XML sitemap node') .'
'. - '
'. t('XML sitemap node adds nodes (content) to the sitemap. The default priority of a node is determined by a combination of its content type priority, and whether it appears on the front page of your site. You can override the default priority for individual nodes when you add or edit a node.', array('@content' => url('admin/content/types'))) .'
'; + '
'. t('XML sitemap node adds nodes (content) to the sitemap. The default priority of a node is determined by a combination of its content type priority, whether it appears on the front page of your site, and the number of comments it has received. You can override the default priority for individual nodes when you add or edit a node.', array('@content' => url('admin/content/types'))) .'
'; } /** - * Implementation of hook_xmlsitemap_link_count(). + * Implementation of hook_xmlsitemap_link_status(). */ -function xmlsitemap_node_xmlsitemap_link_count() { - return (integer) db_result(_xmlsitemap_node_build_query()); +function xmlsitemap_node_xmlsitemap_link_status($type, $id, $sid) { + if (!($node = node_load($id))) { + return XMLSITEMAP_LINK_DISABLED; + } + if ($node->status) { + return 0; + } + return XMLSITEMAP_LINK_DISABLED; } /** * Implementation of hook_xmlsitemap_links(). */ -function xmlsitemap_node_xmlsitemap_links($fp, $from, $count = 0) { - $link = new stdClass(); - $result = _xmlsitemap_node_build_query('*', $from, $count); - while ($row = db_fetch_object($result)) { - $changefreq = max($row->changed - $row->previously_changed, REQUEST_TIME - $row->changed); - $link->loc = url('node/'. $row->pdata, array('absolute' => TRUE)); - $link->changed = $row->changed; - $link->changefreq = $changefreq; - $link->priority = $row->priority_override == -2.0 ? $row->priority : $row->priority_override; - xmlsitemap_output_link($fp, $link); +function xmlsitemap_node_xmlsitemap_links() { + $query = "SELECT n.nid, n.vid, n.type, n.language, n.uid, n.created, n.promote, xn.changed, xn.previously_changed, xn.priority_override, xn.comment_ratio + FROM {node} n + INNER JOIN {xmlsitemap_node} xn ON n.nid = xn.nid + WHERE n.status > 0"; + $result = db_query(db_rewrite_sql($query)); + $row = new stdClass(); + $row->module = 'xmlsitemap_node'; + $row->type = 'node'; + while ($node = db_fetch_object($result)) { + $row->loc = 'node/'. $node->nid; + $row->id = $node->nid; + $row->sid = $node->vid; + $row->language = $node->language; + $row->changed = $node->changed; + $row->changefreq = max(REQUEST_TIME - $node->changed, empty($node->previously_changed) ? $node->changed - $node->created : $node->changed - $node->previously_changed); + $priority = xmlsitemap_node_get_priority($node); + $row->priority = ($priority == -1.0) ? $priority : min(max(round($priority, 1), 0.0), 1.0); + $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 == 'node' && $old_row->priority != $row->priority) { + $row->lid = $old_row->lid; + drupal_write_record('xmlsitemap', $row, 'lid'); + } } } @@ -196,43 +323,140 @@ function xmlsitemap_node_xmlsitemap_link * Add submit actions to forms. */ function xmlsitemap_node_type_submit($form, &$form_state) { - xmlsitemap_flag_sitemap(TRUE); + xmlsitemap_flag_sitemap(); } /***************************************************************************** - * Private functions. + * Public functions. ****************************************************************************/ /** - * Return the query to execute on xmlsitemap_node table. - * @param $what - * The part of the query between 'SELECT' and 'FROM'. + * Get the node priority in the sitemap. + * @param $node + * The node object. + * @param $load + * TRUE if priority_override must be loaded from the module table. * @return - * A database query result resource, or FALSE if the query was not executed - * correctly. + * The priority for the node. + * @see xmlsitemap_node_set_priority() */ -function _xmlsitemap_node_build_query($what = 'COUNT(*)', $from = 0, $count = 0) { - global $language; - $default = language_default(); - $args = array($language->language, ''); - $language_query = "AND language IN (". db_placeholders($args, 'varchar'). ")"; - switch(variable_get('language_negotiation', LANGUAGE_NEGOTIATION_NONE)) { - case LANGUAGE_NEGOTIATION_NONE: - $language_query = ''; - break; - case LANGUAGE_NEGOTIATION_PATH_DEFAULT: - case LANGUAGE_NEGOTIATION_PATH: - if (variable_get('xmlsitemap_all_links_to_default_language', 0) && $language->language == $default->language) { - $language_query = ''; +function xmlsitemap_node_get_priority($node, $load = FALSE) { + if (!isset($node->priority_override) && $load) { + $priority_override = db_result(db_query("SELECT xn.priority_override FROM {xmlsitemap_node} xn ON WHERE xn.nid = %d", $node->nid)); + if ($priority_override !== FALSE) { + $node->priority_override = $priority_override; + } + } + if (isset($node->priority_override) && $node->priority_override != -2.0) { + $priority = $node->priority_override; + } + elseif (($priority = variable_get('xmlsitemap_node_type_priority_'. $node->type, 0.5)) != -1.0) { + if ($node->promote) { + $priority += variable_get('xmlsitemap_node_promote_priority', 0.3); + } + $priority += $node->comment_ratio * variable_get('xmlsitemap_node_comment_priority', 0.2); + } + if (!isset($priority)) { + $priority = -1.0; + } + return $priority; +} + +/** + * Set the node priority in the sitemap. + * @param $node + * The node object, or the node ID. + * @param $priority + * The priority for the node. + * @return + * The node object, or FALSE. + */ +function xmlsitemap_node_set_priority($node, $priority) { + if (!is_numeric($node)) { + $node = (object) $node; + $nid = $node->nid; + } + else { + $nid = $node; + $node = node_load($nid); + } + if ($node) { + $result = db_fetch_object(db_query("SELECT nid, changed, previously_changed, comment_ratio, priority_override + FROM {xmlsitemap_node} + WHERE nid = %d", $nid) + ); + if ($result === FALSE) { + $row = new stdClass(); + $row->nid = $nid; + $row->changed = $node->changed; + $row->previously_changed = $node->created; + } + else { + $row = $result; + if ($node->changed > $row->changed) { + $row->previously_changed = $row->changed; + $row->changed = $node->changed; } - break; + } + $row->priority_override = $priority; + drupal_write_record('xmlsitemap_node', $row, $result === FALSE ? NULL : 'nid'); + return $node; + } + return FALSE; +} + +/***************************************************************************** + * Private functions - node operation callbacks. + ****************************************************************************/ + +/** + * Node operations callback. + */ +function _xmlsitemap_node_priority_operations($nodes, $priority) { + if (count($nodes)) { + $batch = array( + 'operations' => array( + array('_xmlsitemap_node_batch_process', array($nodes, $priority)) + ), + 'finished' => 'xmlsitemap_batch_operations_finished', + 'title' => t('Processing'), + 'progress_message' => '', + 'error_message' => t('The update has encountered an error.'), + ); + batch_set($batch); + } +} + +/***************************************************************************** + * Private functions - batch operation callbacks. + ****************************************************************************/ + +/** + * Node operations batch process callback. + */ +function _xmlsitemap_node_batch_process($nodes, $priority, &$context) { + if (!isset($context['sandbox']['progress'])) { + $context['sandbox']['progress'] = 0; + $context['sandbox']['max'] = count($nodes); + $context['sandbox']['nodes'] = $nodes; + if (module_exists('comment')) { + $context['sandbox']['maxcomments'] = (integer) db_result(db_query('SELECT MAX(comment_count) FROM {node_comment_statistics}')); + } + } + $nid = array_shift($context['sandbox']['nodes']); + if ($node = xmlsitemap_node_set_priority($nid, $priority)) { + $context['results'][] = l($node->title, 'node/'. $nid); + if (count($context['results']) > 6) { + array_shift($context['results']); + } + } + $context['sandbox']['progress']++; + if ($context['sandbox']['progress'] != $context['sandbox']['max']) { + $context['finished'] = $context['sandbox']['progress'] / $context['sandbox']['max']; } - $order = $what == 'COUNT(*)' ? '' : ' ORDER BY changed DESC, previously_changed DESC'; - $query = "SELECT ". $what ." FROM {xmlsitemap_node} WHERE status = 1 AND ((priority >= 0.0 AND priority <= 1.0 AND priority_override = -2.0) OR (priority_override >= 1.0 AND priority_override <= 1.0))". $language_query . $order; - if ($count) { - return db_query_range($query, $from, $count); + else { + xmlsitemap_flag_sitemap(); } - return db_query($query, $args); } /** diff -upNr -x CVS -x CHANGELOG.txt -x '.#*' -I '.*\$Id.*' xmlsitemap-DRUPAL-6--1/xmlsitemap_taxonomy/translations/xmlsitemap_taxonomy.de.po xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_taxonomy/translations/xmlsitemap_taxonomy.de.po --- xmlsitemap-DRUPAL-6--1/xmlsitemap_taxonomy/translations/xmlsitemap_taxonomy.de.po 2009-06-05 19:43:28 -0400 +++ xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_taxonomy/translations/xmlsitemap_taxonomy.de.po 1969-12-31 19:00:00 -0500 @@ -1,44 +0,0 @@ -# $Id: xmlsitemap_taxonomy.de.po,v 1.1.2.2 2009/06/05 23:43:28 hass Exp $ -# -# LANGUAGE translation of Drupal (gsitemap.module) -# Copyright YEAR NAME -# Generated from files: -# gsitemap.module,v 1.56.2.7 2007/03/18 21:55:39 darrenoh -# gsitemap.info,v 1.3.2.3 2007/02/13 15:57:06 darrenoh -# -msgid "" -msgstr "" -"Project-Id-Version: German translation of xmlsitemap_taxonomy\n" -"POT-Creation-Date: 2009-06-06 01:06+0200\n" -"PO-Revision-Date: 2009-06-06 01:19+0100\n" -"Last-Translator: Alexander Haß\n" -"Language-Team: Alexander Hass\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: German\n" -"X-Poedit-Country: GERMANY\n" -"X-Poedit-SourceCharset: utf-8\n" - -#: xmlsitemap_taxonomy/xmlsitemap_taxonomy.module:77 -msgid "This will be the default priority of terms in this vocabulary." -msgstr "Dies wird die Standardpriorität von Begriffen in diesem Vokabular." - -#: xmlsitemap_taxonomy/xmlsitemap_taxonomy.module:178 -#: xmlsitemap_taxonomy/xmlsitemap_taxonomy.info:0 -msgid "XML sitemap taxonomy" -msgstr "XML-Sitemap - Taxonomie" - -#: xmlsitemap_taxonomy/xmlsitemap_taxonomy.module:179 -msgid "The module adds taxonomy terms (categories) to the sitemap. You can change the default priority when you add or edit a vocabulary, and you can override the default priority when you add or edit individual terms." -msgstr "" - -#: xmlsitemap_taxonomy/xmlsitemap_taxonomy.module:0 -msgid "xmlsitemap_taxonomy" -msgstr "xmlsitemap_taxonomy" - -#: xmlsitemap_taxonomy/xmlsitemap_taxonomy.info:0 -msgid "Add taxonomy term links to the sitemap." -msgstr "Fügt Links von Taxonomie-Begriffen in die Sitemap ein." - diff -upNr -x CVS -x CHANGELOG.txt -x '.#*' -I '.*\$Id.*' xmlsitemap-DRUPAL-6--1/xmlsitemap_taxonomy/translations/xmlsitemap_taxonomy.pot xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_taxonomy/translations/xmlsitemap_taxonomy.pot --- xmlsitemap-DRUPAL-6--1/xmlsitemap_taxonomy/translations/xmlsitemap_taxonomy.pot 2009-06-05 19:08:44 -0400 +++ xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_taxonomy/translations/xmlsitemap_taxonomy.pot 1969-12-31 19:00:00 -0500 @@ -1,41 +0,0 @@ -# $Id: xmlsitemap_taxonomy.pot,v 1.1.2.1 2009/06/05 23:08:44 hass Exp $ -# -# LANGUAGE translation of Drupal (xmlsitemap_taxonomy) -# Copyright YEAR NAME -# Generated from files: -# xmlsitemap_taxonomy.module,v 1.1.2.11 2009/06/04 21:40:25 davereid -# xmlsitemap_taxonomy.info,v 1.1.2.2 2009/05/07 17:10:35 kiam -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2009-06-06 01:06+0200\n" -"PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" -"Last-Translator: NAME \n" -"Language-Team: LANGUAGE \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_taxonomy/xmlsitemap_taxonomy.module:77 -msgid "This will be the default priority of terms in this vocabulary." -msgstr "" - -#: xmlsitemap_taxonomy/xmlsitemap_taxonomy.module:178 xmlsitemap_taxonomy/xmlsitemap_taxonomy.info:0 -msgid "XML sitemap taxonomy" -msgstr "" - -#: xmlsitemap_taxonomy/xmlsitemap_taxonomy.module:179 -msgid "The module adds taxonomy terms (categories) to the sitemap. You can change the default priority when you add or edit a vocabulary, and you can override the default priority when you add or edit individual terms." -msgstr "" - -#: xmlsitemap_taxonomy/xmlsitemap_taxonomy.module:0 -msgid "xmlsitemap_taxonomy" -msgstr "" - -#: xmlsitemap_taxonomy/xmlsitemap_taxonomy.info:0 -msgid "Add taxonomy term links to the sitemap." -msgstr "" - diff -upNr -x CVS -x CHANGELOG.txt -x '.#*' -I '.*\$Id.*' xmlsitemap-DRUPAL-6--1/xmlsitemap_taxonomy/xmlsitemap_taxonomy.install xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_taxonomy/xmlsitemap_taxonomy.install --- xmlsitemap-DRUPAL-6--1/xmlsitemap_taxonomy/xmlsitemap_taxonomy.install 2009-05-26 22:49:13 -0400 +++ xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_taxonomy/xmlsitemap_taxonomy.install 2009-05-08 09:35:25 -0400 @@ -14,84 +14,59 @@ * Implementation of hook_enable(). */ function xmlsitemap_taxonomy_enable() { - xmlsitemap_flag_sitemap(TRUE); + xmlsitemap_flag_sitemap(); } /** * Implementation of hook_disable(). */ function xmlsitemap_taxonomy_disable() { - xmlsitemap_flag_sitemap(TRUE); + xmlsitemap_flag_sitemap(); } /** * Implementation of hook_schema(). */ function xmlsitemap_taxonomy_schema() { - $schema['xmlsitemap_taxonomy'] = array( - 'description' => 'The list of the taxonomy terms added to the sitemap.', + $schema['xmlsitemap_term'] = array( + 'description' => 'The base table for xmlsitemap_term.', 'fields' => array( - 'mid' => array( - 'description' => 'The primary key.', - 'type' => 'serial', - 'not null' => TRUE, - ), - 'pdata' => array( - 'description' => 'The taxonomy term ID.', + 'tid' => array( + 'description' => 'The vocabulary term ID.', 'type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0, ), - 'sdata' => array( + 'vid' => array( 'description' => 'The vocabulary ID.', 'type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0, ), - 'status' => array( - 'description' => 'Boolean indicating whether or not this node is enabled.', - 'type' => 'int', - 'not null' => TRUE, - 'default' => 1, - ), - 'previously_changed' => array( - 'description' => 'The Unix timestamp of the previous change.', + 'changed' => array( + 'description' => 'The Unix timestamp of the last change.', 'type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0, ), - 'changed' => array( - 'description' => 'The Unix timestamp of the last change.', + 'previously_changed' => array( + 'description' => 'The Unix timestamp of the previous change.', 'type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0, ), - 'priority' => array( - 'description' => 'The priority in the sitemap.', - 'type' => 'float', - 'not null' => TRUE, - 'default' => 0.5, - ), 'priority_override' => array( - 'description' => 'The value that override the normal priority.', + 'description' => 'The priority of the term in the sitemap.', 'type' => 'float', 'not null' => TRUE, 'default' => -2.0, ), ), - 'indexes' => array( - 'link_status' => array('status'), - 'link_changed' => array('changed'), - 'link_priority' => array('priority'), - ), - 'unique keys' => array( - 'link_pdata' => array('pdata'), - ), - 'primary key' => array('mid'), + 'primary key' => array('tid'), ); return $schema; } @@ -100,8 +75,11 @@ function xmlsitemap_taxonomy_schema() { * Implementation of hook_install(). */ function xmlsitemap_taxonomy_install() { - drupal_install_schema('xmlsitemap_taxonomy'); + if (!db_table_exists('xmlsitemap_term')) { + drupal_install_schema('xmlsitemap_taxonomy'); + } db_query("UPDATE {system} SET weight = 10 WHERE name = 'xmlsitemap_taxonomy'"); + db_query("DELETE FROM {system} WHERE name = 'xmlsitemap_term'"); } /** @@ -111,13 +89,167 @@ function xmlsitemap_taxonomy_install() { function xmlsitemap_taxonomy_update_6000() { $ret = array(); if (db_table_exists('xmlsitemap_term')) { - db_drop_table($ret, 'xmlsitemap_term'); - } - if (db_table_exists('xmlsitemap_taxonomy')) { - db_drop_table($ret, 'xmlsitemap_taxonomy'); + if (db_column_exists('xmlsitemap_term', 'pid')) { + $result = array(); + @db_drop_index($result, 'xmlsitemap_term', 'pid'); + if ($result[0]['success']) { + $ret[] = $result[0]; + } + db_drop_field($ret, 'xmlsitemap_term', 'pid'); + } + $result = array(); + @db_drop_primary_key($result, 'xmlsitemap_term'); + if ($result[0]['success']) { + $ret[] = $result[0]; + } + if (db_column_exists('xmlsitemap_term', 'tid')) { + db_change_field($ret, 'xmlsitemap_term', 'tid', 'tid', + array( + 'description' => 'The vocabulary term ID.', + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ), + array('primary key' => array('tid')) + ); + } + else { + db_add_field($ret, 'xmlsitemap_term', 'tid', + array( + 'description' => 'The vocabulary term ID.', + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ), + array('primary key' => array('tid')) + ); + } + if (!db_column_exists('xmlsitemap_term', 'vid')) { + db_add_field($ret, 'xmlsitemap_term', 'vid', + array( + 'description' => 'The vocabulary ID.', + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ) + ); + } + if (db_column_exists('xmlsitemap_term', 'last_changed')) { + db_change_field($ret, 'xmlsitemap_term', 'last_changed', 'changed', + array( + 'description' => 'The Unix timestamp of the last change.', + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ) + ); + } + else { + if (!db_column_exists('xmlsitemap_term', 'changed')) { + db_add_field($ret, 'xmlsitemap_term', 'changed', + array( + 'description' => 'The Unix timestamp of the last change.', + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ) + ); + } + else { + db_change_field($ret, 'xmlsitemap_term', 'changed', 'changed', + array( + 'description' => 'The Unix timestamp of the last change.', + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ) + ); + } + } + if (!db_column_exists('xmlsitemap_term', 'previously_changed')) { + db_add_field($ret, 'xmlsitemap_term', 'previously_changed', + array( + 'description' => 'The Unix timestamp of the previous change.', + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ) + ); + } + else { + db_change_field($ret, 'xmlsitemap_term', 'previously_changed', 'previously_changed', + array( + 'description' => 'The Unix timestamp of the previous change.', + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ) + ); + } + $ret[] = update_sql("UPDATE {xmlsitemap_term} + SET priority_override = -2.0 + WHERE priority_override IS NULL" + ); + db_change_field($ret, 'xmlsitemap_term', 'priority_override', 'priority_override', + array( + 'description' => 'The priority of the term in the sitemap.', + 'type' => 'float', + 'not null' => TRUE, + 'default' => -2.0, + ) + ); } - foreach(xmlsitemap_taxonomy_schema() as $table => $definition) { - db_create_table($ret, $table, $definition); + else { + db_create_table($ret, 'xmlsitemap_term', + array( + 'description' => 'The base table for xmlsitemap_term.', + 'fields' => array( + 'tid' => array( + 'description' => 'The vocabulary term ID.', + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ), + 'vid' => array( + 'description' => 'The vocabulary ID.', + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ), + 'changed' => array( + 'description' => 'The Unix timestamp of the last change.', + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ), + 'previously_changed' => array( + 'description' => 'The Unix timestamp of the previous change.', + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ), + 'priority_override' => array( + 'description' => 'The priority of the term in the sitemap.', + 'type' => 'float', + 'not null' => TRUE, + 'default' => -2.0, + ), + ), + 'primary key' => array('tid'), + ) + ); } return $ret; } @@ -125,6 +257,48 @@ function xmlsitemap_taxonomy_update_6000 /** * Implementation of hook_update_N(). */ +function xmlsitemap_taxonomy_update_6100() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_taxonomy_update_6101() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_taxonomy_update_6102() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_taxonomy_update_6103() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_taxonomy_update_6104() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_taxonomy_update_6105() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ function xmlsitemap_taxonomy_update_6106() { $ret[] = update_sql("UPDATE {system} SET weight = 10 WHERE name = 'xmlsitemap_taxonomy'"); return $ret; @@ -134,29 +308,58 @@ function xmlsitemap_taxonomy_update_6106 * Implementation of hook_update_N(). */ function xmlsitemap_taxonomy_update_6107() { - return xmlsitemap_taxonomy_update_6000(); + return xmlsitemap_term_update_6000(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_taxonomy_update_6108() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_taxonomy_update_6109() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_taxonomy_update_6110() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_taxonomy_update_6111() { + return array(); } /** * Implementation of hook_update_N(). * */ -function xmlsitemap_taxonomy_update_6114() { - $ret = array(); - $result = db_query("SELECT name FROM {variable} WHERE name LIKE 'xmlsitemap\_term\_%'"); - while ($name = db_result($result)) { - $new_name = str_replace('_term_', '_taxonomy_', $name); - $ret[] = update_sql("UPDATE {variable} set name = '$new_name' WHERE name = '$name'"); - } - return $ret; +function xmlsitemap_taxonomy_update_6112() { + return array(); } /** * Implementation of hook_update_N(). * */ -function xmlsitemap_taxonomy_update_6115() { - return xmlsitemap_taxonomy_update_6000(); +function xmlsitemap_taxonomy_update_6113() { + $result = db_query("SELECT name FROM {variable} WHERE name LIKE 'xmlsitemap\_term\_%'"); + while ($row = db_fetch_object($result)) { + $new_name = preg_replace('/_term_/', '_taxonomy_', $row->name); + $ret[] = update_sql("UPDATE {variable} set name = '$new_name' WHERE name LIKE 'xmlsitemap\_term\_%'"); + } + $ret[] = update_sql("UPDATE {xmlsitemap} set module = 'xmlsitemap_taxonomy' WHERE module = 'xmlsitemap_term'"); + $ret[] = update_sql("DELETE FROM {system} WHERE name = 'xmlsitemap_term'"); + return $ret; } /** @@ -166,3 +369,4 @@ function xmlsitemap_taxonomy_uninstall() drupal_uninstall_schema('xmlsitemap_taxonomy'); db_query("DELETE FROM {variable} WHERE name LIKE 'xmlsitemap\_taxonomy\_%'"); } + diff -upNr -x CVS -x CHANGELOG.txt -x '.#*' -I '.*\$Id.*' xmlsitemap-DRUPAL-6--1/xmlsitemap_taxonomy/xmlsitemap_taxonomy.module xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_taxonomy/xmlsitemap_taxonomy.module --- xmlsitemap-DRUPAL-6--1/xmlsitemap_taxonomy/xmlsitemap_taxonomy.module 2009-06-06 12:58:39 -0400 +++ xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_taxonomy/xmlsitemap_taxonomy.module 2009-05-08 09:32:35 -0400 @@ -19,16 +19,18 @@ * Implementation of hook_cron(). */ function xmlsitemap_taxonomy_cron() { - $limit = variable_get('xmlsitemap_cron_limit', 200); - $sql = "SELECT t.*, v.module FROM {term_data} t INNER JOIN {vocabulary} v ON v.vid = t.vid LEFT JOIN {xmlsitemap_taxonomy} xt ON xt.pdata = t.tid WHERE xt.pdata IS NULL ORDER BY v.weight ASC, t.weight ASC"; - $result = db_query_range($sql, 0, $limit); - $row = new stdClass(); - while ($term = db_fetch_object($result)) { - $row->pdata = $term->tid; - $row->sdata = $term->vid; - $row->changed = REQUEST_TIME; - $row->priority = variable_get('xmlsitemap_taxonomy_vocabulary_priority_'. $row->sid, '0.5'); - xmlsitemap_write_link($row, 'xmlsitemap_taxonomy'); + if (($limit = variable_get('xmlsitemap_cron_limit', 100)) != -1) { + $sql = "SELECT t.* FROM {term_data} t + LEFT JOIN {xmlsitemap_term} xt ON xt.tid = t.tid + WHERE xt.tid IS NULL"; + $result = db_query_range($sql, 0, $limit); + while ($term = db_fetch_object($result)) { + $row = new stdClass(); + $row->tid = $term->tid; + $row->vid = $term->vid; + $row->changed = REQUEST_TIME; + drupal_write_record('xmlsitemap_term', $row); + } } } @@ -36,25 +38,27 @@ function xmlsitemap_taxonomy_cron() { * Implementation of hook_form_FORM_ID_alter(). */ function xmlsitemap_taxonomy_form_taxonomy_form_term_alter(&$form, &$from_state) { - $priority_override = db_result(db_query("SELECT priority_override FROM {xmlsitemap_taxonomy} WHERE mid = %d", $form['tid']['#value'])); - if ($priority_override === FALSE) { - $priority_override = -2.0; + $priority = db_result(db_query("SELECT priority_override + FROM {xmlsitemap_term} + WHERE tid = %d", $form['tid']['#value']) + ); + if ($priority === FALSE) { + $priority = -2.0; } - $options = xmlsitemap_priority_options(TRUE, TRUE); - $priority = variable_get('xmlsitemap_taxonomy_vocabulary_priority_'. $form['vid']['#value'], '0.5'); + $options = xmlsitemap_priority_options('both'); + $default = variable_get('xmlsitemap_taxonomy_vocabulary_priority_'. $form['vid']['#value'], '0.5'); if (!isset($form['xmlsitemap'])) { $form['xmlsitemap'] = array( '#type' => 'fieldset', '#title' => t('XML sitemap'), '#collapsible' => TRUE, - '#collapsed' => TRUE, ); } $form['xmlsitemap']['xmlsitemap_taxonomy_priority'] = array( '#type' => 'select', '#title' => t('Priority'), - '#description' => t('The default priority is %priority.', array('%priority' => $options[$priority])), - '#default_value' => $priority_override, + '#description' => t('The default priority is %priority.', array('%priority' => $options[$default])), + '#default_value' => $priority, '#options' => $options, ); $form['submit']['#weight'] = isset($form['submit']['#weight']) ? $form['submit']['#weight'] + 1 : 1; @@ -69,14 +73,13 @@ function xmlsitemap_taxonomy_form_taxono '#type' => 'fieldset', '#title' => t('XML sitemap'), '#collapsible' => TRUE, - '#collapsed' => TRUE, ); $form['xmlsitemap']['xmlsitemap_taxonomy_vocabulary_priority'] = array( '#type' => 'select', '#title' => t('Priority'), '#description' => t('This will be the default priority of terms in this vocabulary.'), '#default_value' => variable_get('xmlsitemap_taxonomy_vocabulary_priority_'. $form['vid']['#value'], 0.5), - '#options' => xmlsitemap_priority_options(TRUE), + '#options' => xmlsitemap_priority_options('exclude'), ); $form['submit']['#weight'] = isset($form['submit']['#weight']) ? $form['submit']['#weight'] + 1 : 1; $form['delete']['#weight'] = isset($form['delete']['#weight']) ? $form['delete']['#weight'] + 1 : 1; @@ -86,44 +89,29 @@ function xmlsitemap_taxonomy_form_taxono * Implementation of hook_nodeapi(). */ function xmlsitemap_taxonomy_nodeapi(&$node, $op, $a3 = NULL, $a4 = NULL) { - $count = 0; switch ($op) { - case 'insert': case 'update': - if (!empty($node->taxonomy)) { - $terms = $node->taxonomy; - if (isset($terms['tags'])) { - $tags = $terms['tags']; - unset($terms['tags']); - foreach ($tags as $vid => $vid_value) { - $tag_terms = drupal_explode_tags($vid_value); - foreach ($tag_terms as $tag_term) { - $possibilities = taxonomy_get_term_by_name($tag_term); - foreach ($possibilities as $possibility) { - if ($possibility->vid == $vid) { - $count += (integer) _xmlsitemap_taxonomy_add_term($node, $possibility->tid); - } - } - } - } + $terms = taxonomy_node_get_terms($node); + foreach ($terms as $term) { + $result = db_fetch_object(db_query("SELECT tid, changed, previously_changed, priority_override + FROM {xmlsitemap_term} + WHERE tid = %d", $term->tid)); + if ($result === FALSE) { + $row = new stdClass(); + $row->tid = $term->tid; + $row->vid = $term->vid; + $row->changed = $node->changed; + $row->previously_changed = $node->created; } - if (is_array($terms)) { - foreach ($terms as $term) { - if (is_array($term)) { - foreach ($term as $tid) { - if ($tid) { - _xmlsitemap_taxonomy_add_term($node, $tid); - } - } - } - elseif (is_object($term)) { - _xmlsitemap_taxonomy_add_term($node, $term->tid); - } - elseif ($term) { - _xmlsitemap_taxonomy_add_term($node, $term); - } + else { + $row = $result; + if ($row->changed < $node->changed) { + $row->previously_changed = $row->changed; + $row->changed = $node->changed; } } + drupal_write_record('xmlsitemap_term', $row, $result === FALSE ? NULL : 'tid'); + xmlsitemap_flag_sitemap(); } break; } @@ -137,16 +125,16 @@ function xmlsitemap_taxonomy_taxonomy($o if ($type == 'vocabulary') { switch ($op) { case 'delete': - db_query("DELETE FROM {xmlsitemap_taxonomy} WHERE sid = %d", $array['vid']); + db_query("DELETE FROM {xmlsitemap_term} WHERE vid = %d", $array['vid']); variable_del('xmlsitemap_taxonomy_vocabulary_priority_'. $array['vid']); - xmlsitemap_flag_sitemap(TRUE); + xmlsitemap_flag_sitemap(); break; case 'insert': case 'update': if (isset($array['vid'])) { if (variable_get('xmlsitemap_taxonomy_vocabulary_priority_'. $array['vid'], 0.5) != $array['xmlsitemap_taxonomy_vocabulary_priority']) { variable_set('xmlsitemap_taxonomy_vocabulary_priority_'. $array['vid'], $array['xmlsitemap_taxonomy_vocabulary_priority']); - xmlsitemap_flag_sitemap(TRUE); + xmlsitemap_flag_sitemap(); } } break; @@ -155,19 +143,40 @@ function xmlsitemap_taxonomy_taxonomy($o else { switch ($op) { case 'delete': - db_query("DELETE FROM {xmlsitemap_taxonomy} WHERE mid = %d", $array['tid']); - xmlsitemap_flag_sitemap(TRUE); + db_query("DELETE FROM {xmlsitemap_term} WHERE tid = %d", $array['tid']); break; case 'insert': + if (isset($array['tid']) && isset($array['vid'])) { + $row = new stdClass(); + $row->tid = $array['tid']; + $row->vid = $array['vid']; + $row->changed = REQUEST_TIME; + $row->priority_override = isset($array['xmlsitemap_taxonomy_priority']) ? $array['xmlsitemap_taxonomy_priority'] : -2.0; + drupal_write_record('xmlsitemap_term', $row); + } + break; case 'update': - $row = new stdClass(); - $row->pdata = $array['tid']; - $row->sdata = $array['vid']; - $row->changed = REQUEST_TIME; - $row->priority = variable_get('xmlsitemap_taxonomy_vocabulary_priority_'. $row->sdata, '0.5'); - xmlsitemap_write_link($row, 'xmlsitemap_taxonomy'); + $result = db_fetch_object(db_query("SELECT tid, vid, changed, previously_changed, priority_override + FROM {xmlsitemap_term} + WHERE tid = %d", $array['tid']) + ); + if ($result === FALSE) { + $row = new stdClass(); + $row->tid = $array['tid']; + $row->vid = $array['vid']; + $row->changed = REQUEST_TIME; + $row->priority_override = isset($array['xmlsitemap_taxonomy_priority']) ? $array['xmlsitemap_taxonomy_priority'] : -2.0; + } + else { + $row = $result; + if (isset($array['xmlsitemap_taxonomy_priority'])) { + $row->priority_override = $array['xmlsitemap_taxonomy_priority']; + } + } + drupal_write_record('xmlsitemap_term', $row, $result === FALSE ? NULL : 'tid'); break; } + xmlsitemap_flag_sitemap(); } } @@ -175,67 +184,52 @@ function xmlsitemap_taxonomy_taxonomy($o * Implementation of hook_xmlsitemap_description(). */ function xmlsitemap_taxonomy_xmlsitemap_description() { - return '
'. t('XML sitemap taxonomy') .'
'. + return '
'. t('XML sitemap term') .'
'. '
'. t('The module adds taxonomy terms (categories) to the sitemap. You can change the default priority when you add or edit a vocabulary, and you can override the default priority when you add or edit individual terms.', array('@terms' => url('admin/content/taxonomy'))) .'
'; } /** - * Implementation of hook_xmlsitemap_link_count(). - */ -function xmlsitemap_taxonomy_xmlsitemap_link_count() { - $query = "SELECT COUNT(*) FROM {xmlsitemap_taxonomy} WHERE status = 1 AND ((priority >= 0.0 AND priority <= 1.0 AND priority_override = -2.0) OR (priority_override >= 1.0 AND priority_override <= 1.0))"; - return (integer) db_result(db_query($query)); -} - -/** * Implementation of hook_xmlsitemap_links(). */ -function xmlsitemap_taxonomy_xmlsitemap_links($fp, $from, $count = 0) { - $link = new stdClass(); - $query = "SELECT * FROM {xmlsitemap_taxonomy} WHERE status = 1 AND ((priority >= 0.0 AND priority <= 1.0 AND priority_override = -2.0) OR (priority_override >= 1.0 AND priority_override <= 1.0)) ORDER BY changed DESC, previously_changed DESC"; - if ($count) { - $result = db_query_range($query, $from, $count); - } - else { - $result = db_query($query); - } - while ($row = db_fetch_object($result)) { - $changefreq = max($row->changed - $row->previously_changed, REQUEST_TIME - $row->changed); - $term = db_fetch_object(db_query('SELECT * FROM {term_data} WHERE tid = %d', $row->pdata)); - $link->loc = url(taxonomy_term_path($term), array('absolute' => TRUE)); - $link->changed = $row->changed; - $link->changefreq = $changefreq; - $link->priority = $row->priority_override == -2.0 ? $row->priority : $row->priority_override; - xmlsitemap_output_link($fp, $link); - } -} - -/***************************************************************************** - * Private functions. - ****************************************************************************/ - -/** - * Add the taxonomy term associated with a node to the sitemap table. - * @param $node - * The node object. - * @param $tid - * The term ID. - * @param $priority_override - * A value that override the priority normally calculated for the taxonomy - * term. - */ -function _xmlsitemap_taxonomy_add_term($node, $tid, $priority_override = -2.0) { - if (($term = db_fetch_object(db_query("SELECT t.*, v.module FROM {term_data} t INNER JOIN {vocabulary} v ON v.vid = t.vid WHERE t.tid = %d", $tid))) == FALSE) { - return; - } +function xmlsitemap_taxonomy_xmlsitemap_links() { + $result = db_query( + db_rewrite_sql( + "SELECT t.tid, t.vid, v.module, xt.changed, xt.previously_changed, xt.priority_override + FROM {term_data} t + LEFT JOIN {vocabulary} v ON t.vid = v.vid + LEFT JOIN {xmlsitemap_term} xt ON t.tid = xt.tid", + 't', 'tid' + ) + ); $row = new stdClass(); - $row->pdata = $tid; - $row->sdata = $term->vid; - $row->previously_changed = $node->created; - $row->changed = $node->changed; - $row->priority = variable_get('xmlsitemap_taxonomy_vocabulary_priority_'. $row->sdata, '0.5'); - $row->priority_override = $priority_override; - xmlsitemap_write_link($row, 'xmlsitemap_taxonomy'); + $row->module = 'xmlsitemap_taxonomy'; + $row->type = 'taxonomy'; + while ($term = db_fetch_object($result)) { + if ($term->module == 'forum') { + $row->loc = 'forum/'. $term->tid; + } + else { + $row->loc = taxonomy_term_path($term); + } + $row->id = $term->tid; + $row->changed = $term->changed; + $row->changefreq = max(REQUEST_TIME - $term->changed, empty($term->previously_changed) ? 0 : $term->changed - $term->previously_changed); + if ($term->priority_override != -2.0) { + $priority = $term->priority_override; + } + else { + $priority = variable_get('xmlsitemap_taxonomy_vocabulary_priority_'. $term->vid, 0.5); + } + $row->priority = ($priority == -1.0) ? $priority : min(max(round($priority, 1), 0.0), 1.0); + $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 = 'taxonomy' && $old_row->priority != $row->priority) { + $row->lid = $old_row->lid; + drupal_write_record('xmlsitemap', $row, 'lid'); + } + } } /** diff -upNr -x CVS -x CHANGELOG.txt -x '.#*' -I '.*\$Id.*' xmlsitemap-DRUPAL-6--1/xmlsitemap_user/translations/fr.po xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_user/translations/fr.po --- xmlsitemap-DRUPAL-6--1/xmlsitemap_user/translations/fr.po 1969-12-31 19:00:00 -0500 +++ xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_user/translations/fr.po 2009-04-01 05:38:25 -0400 @@ -0,0 +1,126 @@ +# $Id: fr.po,v 1.1.2.1 2009/04/01 09:38:25 slybud Exp $ +# +# French translation of Drupal (general) +# Copyright YEAR NAME +# 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_user drupal6 module\n" +"POT-Creation-Date: 2009-04-01 11:08+0200\n" +"PO-Revision-Date: 2009-04-01 11:13+0100\n" +"Last-Translator: Sylvain Moreau \n" +"Language-Team: Sylvain Moreau, OWS \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_user.module:27;54 +msgid "XML site map" +msgstr "Plan du site XML" + +#: xmlsitemap_user.module:34 +msgid "Default user priority" +msgstr "Priorité utilisateur par défaut" + +#: xmlsitemap_user.module:35 +msgid "The default priority for users who have only the authenticated user role." +msgstr "La priorité par défaut pour les utilisateurs qui possèdent le rôle utilisateur authentifié." + +#: xmlsitemap_user.module:60 +msgid "Default priority" +msgstr "Priorité par défaut" + +#: xmlsitemap_user.module:61 +msgid "The priority of all a user's roles will be added together to set the user's default priority. If all role priorities are left at default, the user's default priority will be %priority." +msgstr "Les priorités de tous les rôles de l'utilisateur seront additionnées pour définir la priorité par défaut de l'utilisateur. Si toutes les priorités des rôles sont laissées à la valeur par défaut, la priorité par défaut de l'utilisateur sera %priority." + +#: xmlsitemap_user.module:105 +msgid "User priority" +msgstr "Priorité utilisateur" + +#: xmlsitemap_user.module:106 +msgid "The default priority is %priority." +msgstr "La priorité par défaut est %priority." + +#: xmlsitemap_user.module:156 +msgid "Add the selected users to the XML site map" +msgstr "Ajoute les utilisateurs sélectionnés au plan du site XML" + +#: xmlsitemap_user.module:161 +msgid "Change the XML site map priority of the selected users to default" +msgstr "Modifier à la valeur par défaut la priorité dans le plan du site XML des utilisateurs sélectionnés" + +#: xmlsitemap_user.module:166 +msgid "Remove the selected users from the XML site map" +msgstr "Supprimer les utilisateurs sélectionnés du plan du site XML" + +#: xmlsitemap_user.module:178 +#: xmlsitemap_user.info:0 +msgid "XML Sitemap: User" +msgstr "XML Sitemap : User" + +#: xmlsitemap_user.module:179 +msgid "The module adds user profiles to the site map. The anonymous user role must have permission to access user profiles on the access control page. You can change the default user priority on the user settings page. The user role priority will override the default user priority. You can override both the default priority and the role priority when you add or edit a user." +msgstr "Le module ajoute les profils utilisateur au plan du site. Le rôle utilisateur anonyme doit posséder la permission d'accès aux profils utilisateurs sur la page de contrôle d'accès. Vous pouvez modifier la priorité par défaut des utilisateurs sur la page des paramètres utilisateurs. La prirorité du rôle utilisateur remplacera la valeur par défaut de la priorité utilisateur. Vous pouvez remplacer à la fois la priorité par défaut et la priorité du rôle lors de l'ajout ou de l'édition d'un utilisateur." + +#: xmlsitemap_user.module:239 +msgid "Comment ratio weight - users" +msgstr "Poids du ratio commentaires - utilisateurs" + +#: xmlsitemap_user.module:240 +msgid "This number will be added to the priority of the user who authored the highest number of comments; for the other users, the number is calculated proportionally to the number of authored comments. This doesn't apply if the maximum number of comments is one, nor for the users for which the priority is overriden." +msgstr "Ce nombre sera ajouté à la priorité de l'utilisateur ayant crée le plus grand nombre de commentaires; pour les autres utilisateurs, le nombre est calculé proportionnellement au nombre de commentaires publiés. Ceci ne s'applique pas dans le cas où le nombre maximum de commentaires est un, ni pour les utilisateurs dont la priorité est remplacée." + +#: xmlsitemap_user.module:279 +msgid "Processing" +msgstr "Exécution" + +#: xmlsitemap_user.module:281 +msgid "The update has encountered an error." +msgstr "La mise à jour a échoué." + +#: xmlsitemap_user.module:0 +msgid "xmlsitemap_user" +msgstr "xmlsitemap_user" + +#: xmlsitemap_user.install:84;267;275;295 +msgid "The priority assigned to the role." +msgstr "La priorité assignée au rôle." + +#: xmlsitemap_user.install:468 +msgid "Updating %name" +msgstr "Mise à jour de %name" + +#: xmlsitemap_user.info:0 +msgid "Adds user profiles to the site map." +msgstr "Ajoute les profils utilisateurs au plan du site." + +#: xmlsitemap_user.info:0 +msgid "XML Sitemap" +msgstr "XML Sitemap" + diff -upNr -x CVS -x CHANGELOG.txt -x '.#*' -I '.*\$Id.*' xmlsitemap-DRUPAL-6--1/xmlsitemap_user/translations/xmlsitemap_user.de.po xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_user/translations/xmlsitemap_user.de.po --- xmlsitemap-DRUPAL-6--1/xmlsitemap_user/translations/xmlsitemap_user.de.po 2009-06-05 19:43:29 -0400 +++ xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_user/translations/xmlsitemap_user.de.po 1969-12-31 19:00:00 -0500 @@ -1,61 +0,0 @@ -# $Id: xmlsitemap_user.de.po,v 1.1.2.2 2009/06/05 23:43:29 hass Exp $ -# -# LANGUAGE translation of Drupal (gsitemap.module) -# Copyright YEAR NAME -# Generated from files: -# gsitemap.module,v 1.56.2.7 2007/03/18 21:55:39 darrenoh -# gsitemap.info,v 1.3.2.3 2007/02/13 15:57:06 darrenoh -# -msgid "" -msgstr "" -"Project-Id-Version: German translation of xmlsitemap_user\n" -"POT-Creation-Date: 2009-06-06 01:06+0200\n" -"PO-Revision-Date: 2009-06-06 01:19+0100\n" -"Last-Translator: Alexander Haß\n" -"Language-Team: Alexander Hass\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: German\n" -"X-Poedit-Country: GERMANY\n" -"X-Poedit-SourceCharset: utf-8\n" - -#: xmlsitemap_user/xmlsitemap_user.module:54 -msgid "Default user priority" -msgstr "Standardpriorität für Benutzer" - -#: xmlsitemap_user/xmlsitemap_user.module:55 -#, fuzzy -msgid "The default priority for users who have only the authenticated user role." -msgstr "Die Standardpriorität für Benutzer auswählen, die nur der Rolle „authentifizierte Benutzer“ zugewiesen sind." - -#: xmlsitemap_user/xmlsitemap_user.module:81 -msgid "Default priority" -msgstr "Standardpriorität" - -#: xmlsitemap_user/xmlsitemap_user.module:82 -msgid "The priority of all a user's roles will be added together to set the user's default priority. If all role priorities are left at default, the user's default priority will be %priority." -msgstr "" - -#: xmlsitemap_user/xmlsitemap_user.module:107 -msgid "User priority" -msgstr "Benutzerpriorität" - -#: xmlsitemap_user/xmlsitemap_user.module:137 -#: xmlsitemap_user/xmlsitemap_user.info:0 -msgid "XML sitemap user" -msgstr "XML-Sitemap - Benutzer" - -#: xmlsitemap_user/xmlsitemap_user.module:138 -msgid "The module adds user profiles to the sitemap. The anonymous user role must have permission to access user profiles on the access control page. You can change the default user priority on the user settings page. The user role priority will override the default user priority. You can override both the default priority and the role priority when you add or edit a user." -msgstr "" - -#: xmlsitemap_user/xmlsitemap_user.module:0 -msgid "xmlsitemap_user" -msgstr "xmlsitemap_user" - -#: xmlsitemap_user/xmlsitemap_user.info:0 -msgid "Add user profile links to the sitemap." -msgstr "Fügt Links von Benutzerprofilen in die Sitemap ein." - diff -upNr -x CVS -x CHANGELOG.txt -x '.#*' -I '.*\$Id.*' xmlsitemap-DRUPAL-6--1/xmlsitemap_user/translations/xmlsitemap_user.fr.po xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_user/translations/xmlsitemap_user.fr.po --- xmlsitemap-DRUPAL-6--1/xmlsitemap_user/translations/xmlsitemap_user.fr.po 2009-06-05 18:07:57 -0400 +++ xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_user/translations/xmlsitemap_user.fr.po 1969-12-31 19:00:00 -0500 @@ -1,126 +0,0 @@ -# $Id: xmlsitemap_user.fr.po,v 1.1.2.1 2009/06/05 22:07:57 hass Exp $ -# -# French translation of Drupal (general) -# Copyright YEAR NAME -# 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_user drupal6 module\n" -"POT-Creation-Date: 2009-04-01 11:08+0200\n" -"PO-Revision-Date: 2009-04-01 11:13+0100\n" -"Last-Translator: Sylvain Moreau \n" -"Language-Team: Sylvain Moreau, OWS \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_user.module:27;54 -msgid "XML site map" -msgstr "Plan du site XML" - -#: xmlsitemap_user.module:34 -msgid "Default user priority" -msgstr "Priorité utilisateur par défaut" - -#: xmlsitemap_user.module:35 -msgid "The default priority for users who have only the authenticated user role." -msgstr "La priorité par défaut pour les utilisateurs qui possèdent le rôle utilisateur authentifié." - -#: xmlsitemap_user.module:60 -msgid "Default priority" -msgstr "Priorité par défaut" - -#: xmlsitemap_user.module:61 -msgid "The priority of all a user's roles will be added together to set the user's default priority. If all role priorities are left at default, the user's default priority will be %priority." -msgstr "Les priorités de tous les rôles de l'utilisateur seront additionnées pour définir la priorité par défaut de l'utilisateur. Si toutes les priorités des rôles sont laissées à la valeur par défaut, la priorité par défaut de l'utilisateur sera %priority." - -#: xmlsitemap_user.module:105 -msgid "User priority" -msgstr "Priorité utilisateur" - -#: xmlsitemap_user.module:106 -msgid "The default priority is %priority." -msgstr "La priorité par défaut est %priority." - -#: xmlsitemap_user.module:156 -msgid "Add the selected users to the XML site map" -msgstr "Ajoute les utilisateurs sélectionnés au plan du site XML" - -#: xmlsitemap_user.module:161 -msgid "Change the XML site map priority of the selected users to default" -msgstr "Modifier à la valeur par défaut la priorité dans le plan du site XML des utilisateurs sélectionnés" - -#: xmlsitemap_user.module:166 -msgid "Remove the selected users from the XML site map" -msgstr "Supprimer les utilisateurs sélectionnés du plan du site XML" - -#: xmlsitemap_user.module:178 -#: xmlsitemap_user.info:0 -msgid "XML Sitemap: User" -msgstr "XML Sitemap : User" - -#: xmlsitemap_user.module:179 -msgid "The module adds user profiles to the site map. The anonymous user role must have permission to access user profiles on the access control page. You can change the default user priority on the user settings page. The user role priority will override the default user priority. You can override both the default priority and the role priority when you add or edit a user." -msgstr "Le module ajoute les profils utilisateur au plan du site. Le rôle utilisateur anonyme doit posséder la permission d'accès aux profils utilisateurs sur la page de contrôle d'accès. Vous pouvez modifier la priorité par défaut des utilisateurs sur la page des paramètres utilisateurs. La prirorité du rôle utilisateur remplacera la valeur par défaut de la priorité utilisateur. Vous pouvez remplacer à la fois la priorité par défaut et la priorité du rôle lors de l'ajout ou de l'édition d'un utilisateur." - -#: xmlsitemap_user.module:239 -msgid "Comment ratio weight - users" -msgstr "Poids du ratio commentaires - utilisateurs" - -#: xmlsitemap_user.module:240 -msgid "This number will be added to the priority of the user who authored the highest number of comments; for the other users, the number is calculated proportionally to the number of authored comments. This doesn't apply if the maximum number of comments is one, nor for the users for which the priority is overriden." -msgstr "Ce nombre sera ajouté à la priorité de l'utilisateur ayant crée le plus grand nombre de commentaires; pour les autres utilisateurs, le nombre est calculé proportionnellement au nombre de commentaires publiés. Ceci ne s'applique pas dans le cas où le nombre maximum de commentaires est un, ni pour les utilisateurs dont la priorité est remplacée." - -#: xmlsitemap_user.module:279 -msgid "Processing" -msgstr "Exécution" - -#: xmlsitemap_user.module:281 -msgid "The update has encountered an error." -msgstr "La mise à jour a échoué." - -#: xmlsitemap_user.module:0 -msgid "xmlsitemap_user" -msgstr "xmlsitemap_user" - -#: xmlsitemap_user.install:84;267;275;295 -msgid "The priority assigned to the role." -msgstr "La priorité assignée au rôle." - -#: xmlsitemap_user.install:468 -msgid "Updating %name" -msgstr "Mise à jour de %name" - -#: xmlsitemap_user.info:0 -msgid "Adds user profiles to the site map." -msgstr "Ajoute les profils utilisateurs au plan du site." - -#: xmlsitemap_user.info:0 -msgid "XML Sitemap" -msgstr "XML Sitemap" - diff -upNr -x CVS -x CHANGELOG.txt -x '.#*' -I '.*\$Id.*' xmlsitemap-DRUPAL-6--1/xmlsitemap_user/translations/xmlsitemap_user.pot xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_user/translations/xmlsitemap_user.pot --- xmlsitemap-DRUPAL-6--1/xmlsitemap_user/translations/xmlsitemap_user.pot 2009-06-06 12:58:39 -0400 +++ xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_user/translations/xmlsitemap_user.pot 2009-04-25 19:01:01 -0400 @@ -1,16 +1,17 @@ -# $Id: xmlsitemap_user.pot,v 1.1.2.4 2009/06/05 23:08:45 hass Exp $ +# $Id: xmlsitemap_user.pot,v 1.1.2.3 2009/04/25 23:01:01 kiam Exp $ # -# LANGUAGE translation of Drupal (xmlsitemap_user) +# LANGUAGE translation of Drupal (general) # Copyright YEAR NAME # Generated from files: -# xmlsitemap_user.module,v 1.12.2.100 2009/05/26 11:03:52 kiam -# xmlsitemap_user.info,v 1.2.2.4 2009/05/05 21:53:44 earnie +# xmlsitemap_user.module,v 1.12.2.68 2009/04/24 18:25:58 kiam +# xmlsitemap_user.info,v 1.2.2.3 2009/04/24 18:33:48 kiam +# xmlsitemap_user.install,v 1.6.2.50 2009/04/24 18:25:57 kiam # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" -"POT-Creation-Date: 2009-06-06 01:06+0200\n" +"POT-Creation-Date: 2009-04-26 00:57+0200\n" "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n" "Last-Translator: NAME \n" "Language-Team: LANGUAGE \n" @@ -19,39 +20,83 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: xmlsitemap_user/xmlsitemap_user.module:54 +#: xmlsitemap_user.module:25;56 +msgid "XML site map" +msgstr "" + +#: xmlsitemap_user.module:32 msgid "Default user priority" msgstr "" -#: xmlsitemap_user/xmlsitemap_user.module:55 +#: xmlsitemap_user.module:33 msgid "The default priority for users who have only the authenticated user role." msgstr "" -#: xmlsitemap_user/xmlsitemap_user.module:81 +#: xmlsitemap_user.module:62 msgid "Default priority" msgstr "" -#: xmlsitemap_user/xmlsitemap_user.module:82 +#: xmlsitemap_user.module:63 msgid "The priority of all a user's roles will be added together to set the user's default priority. If all role priorities are left at default, the user's default priority will be %priority." msgstr "" -#: xmlsitemap_user/xmlsitemap_user.module:107 +#: xmlsitemap_user.module:78 +msgid "Comment ratio weight - users" +msgstr "" + +#: xmlsitemap_user.module:79 +msgid "This number will be added to the priority of the user who authored the highest number of comments; for the other users, the number is calculated proportionally to the number of authored comments. This doesn't apply if the maximum number of comments is one, nor for the users for which the priority is overriden." +msgstr "" + +#: xmlsitemap_user.module:119 msgid "User priority" msgstr "" -#: xmlsitemap_user/xmlsitemap_user.module:137 xmlsitemap_user/xmlsitemap_user.info:0 -msgid "XML sitemap user" +#: xmlsitemap_user.module:120 +msgid "The default priority is %priority." +msgstr "" + +#: xmlsitemap_user.module:170 +msgid "Add the selected users to the XML site map" +msgstr "" + +#: xmlsitemap_user.module:175 +msgid "Change the XML site map priority of the selected users to default" +msgstr "" + +#: xmlsitemap_user.module:180 +msgid "Remove the selected users from the XML site map" +msgstr "" + +#: xmlsitemap_user.module:192 xmlsitemap_user.info:0 +msgid "XML Sitemap: User" msgstr "" -#: xmlsitemap_user/xmlsitemap_user.module:138 -msgid "The module adds user profiles to the sitemap. The anonymous user role must have permission to access user profiles on the access control page. You can change the default user priority on the user settings page. The user role priority will override the default user priority. You can override both the default priority and the role priority when you add or edit a user." +#: xmlsitemap_user.module:193 +msgid "The module adds user profiles to the site map. The anonymous user role must have permission to access user profiles on the access control page. You can change the default user priority on the user settings page. The user role priority will override the default user priority. You can override both the default priority and the role priority when you add or edit a user." msgstr "" -#: xmlsitemap_user/xmlsitemap_user.module:0 +#: xmlsitemap_user.module:281 +msgid "Processing" +msgstr "" + +#: xmlsitemap_user.module:283 +msgid "The update has encountered an error." +msgstr "" + +#: xmlsitemap_user.module:0 msgid "xmlsitemap_user" msgstr "" -#: xmlsitemap_user/xmlsitemap_user.info:0 -msgid "Add user profile links to the sitemap." +#: xmlsitemap_user.install:82;265;273;293 +msgid "The priority assigned to the role." +msgstr "" + +#: xmlsitemap_user.info:0 +msgid "Adds user profiles to the site map." +msgstr "" + +#: xmlsitemap_user.info:0 +msgid "XML Sitemap" msgstr "" diff -upNr -x CVS -x CHANGELOG.txt -x '.#*' -I '.*\$Id.*' xmlsitemap-DRUPAL-6--1/xmlsitemap_user/xmlsitemap_user.install xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_user/xmlsitemap_user.install --- xmlsitemap-DRUPAL-6--1/xmlsitemap_user/xmlsitemap_user.install 2009-05-25 21:28:51 -0400 +++ xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_user/xmlsitemap_user.install 2009-05-07 08:59:32 -0400 @@ -14,14 +14,14 @@ * Implementation of hook_enable(). */ function xmlsitemap_user_enable() { - xmlsitemap_flag_sitemap(TRUE); + xmlsitemap_flag_sitemap(); } /** * Implementation of hook_disable(). */ function xmlsitemap_user_disable() { - xmlsitemap_flag_sitemap(TRUE); + xmlsitemap_flag_sitemap(); } /** @@ -29,25 +29,21 @@ function xmlsitemap_user_disable() { */ function xmlsitemap_user_schema() { $schema['xmlsitemap_user'] = array( - 'description' => 'The list of the links added to the sitemap.', + 'description' => 'The base table for xmlsitemap_user.', 'fields' => array( - 'mid' => array( - 'description' => 'The primary key.', - 'type' => 'serial', - 'not null' => TRUE, - ), - 'pdata' => array( + 'uid' => array( 'description' => 'The user ID.', 'type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0, ), - 'status' => array( - 'description' => 'Boolean indicating whether or not this link is enabled.', + 'changed' => array( + 'description' => 'The Unix timestamp of the last change.', 'type' => 'int', + 'unsigned' => TRUE, 'not null' => TRUE, - 'default' => 1, + 'default' => 0, ), 'previously_changed' => array( 'description' => 'The Unix timestamp of the previous change.', @@ -56,35 +52,21 @@ function xmlsitemap_user_schema() { 'not null' => TRUE, 'default' => 0, ), - 'changed' => array( - 'description' => 'The Unix timestamp of the last change.', + 'comments' => array( + 'description' => 'The number of comments authored from the user.', 'type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0, ), - 'priority' => array( - 'description' => 'The priority of the link in the sitemap.', - 'type' => 'float', - 'not null' => TRUE, - 'default' => 0.5, - ), 'priority_override' => array( - 'description' => 'The value that override the normal priority.', + 'description' => 'The priority of the term in the sitemap.', 'type' => 'float', 'not null' => TRUE, 'default' => -2.0, ), ), - 'indexes' => array( - 'link_status' => array('status'), - 'link_changed' => array('changed'), - 'link_priority' => array('priority'), - ), - 'unique keys' => array( - 'link_pdata' => array('pdata'), - ), - 'primary key' => array('mid'), + 'primary key' => array('uid'), ); $schema['xmlsitemap_user_role'] = array( 'description' => 'The user roles settings table.', @@ -97,7 +79,7 @@ function xmlsitemap_user_schema() { 'default' => 0, ), 'priority' => array( - 'description' => 'The priority assigned to the role.', + 'description' => t('The priority assigned to the role.'), 'type' => 'float', 'not null' => TRUE, 'default' => 0.5, @@ -121,81 +103,303 @@ function xmlsitemap_user_install() { */ function xmlsitemap_user_update_6000() { $ret = array(); - $schema = xmlsitemap_user_schema(); if (db_table_exists('xmlsitemap_user')) { - db_drop_table($ret, 'xmlsitemap_user'); - } - foreach(xmlsitemap_user_schema() as $table => $definition) { - if (db_table_exists($table)) { + if (db_column_exists('xmlsitemap_user', 'pid')) { $result = array(); - @db_drop_primary_key($result, $table); + @db_drop_index($result, 'xmlsitemap_user', 'pid'); if ($result[0]['success']) { - $ret[] = $result[0]; - } - if (isset($definition['unique keys'])) { - foreach ($definition['unique keys'] as $key => $info) { - $result = array(); - @db_drop_unique_key($result, $table, $key); - if ($result[0]['success']) { - $ret[] = $result[0]; - } - } - } - if (isset($definition['indexes'])) { - foreach ($definition['indexes'] as $key => $info) { - $result = array(); - @db_drop_index($result, $table, $key); - if ($result[0]['success']) { - $ret[] = $result[0]; - } - } + $ret = $result[0]; } - foreach ($definition['fields'] as $field => $info) { - if (db_column_exists($table, $field)) { - db_change_field($ret, $table, $field, $field, $info); - } - else { - db_add_field($ret, $table, $field, $info); - } + db_drop_field($ret, 'xmlsitemap_user', 'pid'); + } + if (db_column_exists('xmlsitemap_user', 'uid')) { + $result = array(); + @db_drop_primary_key($result, 'xmlsitemap_user'); + if ($result[0]['success']) { + $ret[] = $result[0]; } - if (isset($definition['primary key'])) { - $result = array(); - @db_add_primary_key($result, $table, $definition['primary key']); - if ($result[0]['success']) { - $ret[] = $result[0]; - } + db_change_field($ret, 'xmlsitemap_user', 'uid', 'uid', + array( + 'description' => 'The user ID.', + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ), + array('primary key' => array('uid')) + ); + } + if (db_column_exists('xmlsitemap_user', 'last_changed')) { + db_change_field($ret, 'xmlsitemap_user', 'last_changed', 'changed', + array( + 'description' => 'The Unix timestamp of the last change.', + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ) + ); + } + else { + if (db_column_exists('xmlsitemap_user', 'changed')) { + db_change_field($ret, 'xmlsitemap_user', 'changed', 'changed', + array( + 'description' => 'The Unix timestamp of the last change.', + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ) + ); } - if (isset($definition['unique keys'])) { - foreach ($definition['unique keys'] as $key => $info) { - $result = array(); - @db_add_unique_key($result, $table, $key, $info); - if ($result[0]['success']) { - $ret[] = $result[0]; - } - } + else { + db_add_field($ret, 'xmlsitemap_user', 'changed', + array( + 'description' => 'The Unix timestamp of the last change.', + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ) + ); } - if (isset($definition['indexes'])) { - foreach ($definition['indexes'] as $key => $info) { - $result = array(); - @db_add_index($result, $table, $key, $info); - if ($result[0]['success']) { - $ret[] = $result[0]; - } - } + } + if (!db_column_exists('xmlsitemap_user', 'comments')) { + db_add_field($ret, 'xmlsitemap_user', 'comments', + array( + 'description' => 'The number of comments authored from the user.', + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ) + ); + } + $ret[] = update_sql("UPDATE {xmlsitemap_user} + SET priority_override = -2.0 + WHERE priority_override IS NULL" + ); + db_change_field($ret, 'xmlsitemap_user', 'priority_override', 'priority_override', + array( + 'description' => 'The priority of the term in the sitemap.', + 'type' => 'float', + 'not null' => TRUE, + 'default' => -2.0, + ) + ); + } + else { + db_create_table($ret, 'xmlsitemap_user', + array( + 'description' => 'The base table for xmlsitemap_user.', + 'fields' => array( + 'uid' => array( + 'description' => 'The user ID.', + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ), + 'changed' => array( + 'description' => 'The Unix timestamp of the last change.', + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ), + 'previously_changed' => array( + 'description' => 'The Unix timestamp of the previous change.', + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ), + 'comments' => array( + 'description' => 'The number of comments authored from the user.', + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ), + 'priority_override' => array( + 'description' => 'The priority of the term in the sitemap.', + 'type' => 'float', + 'not null' => TRUE, + 'default' => -2.0, + ), + ), + 'primary key' => array('uid'), + ) + ); + } + if (db_table_exists('xmlsitemap_user_role')) { + if (db_column_exists('xmlsitemap_user_role', 'pid')) { + $result = array(); + @db_drop_index($result, 'xmlsitemap_user_role', 'pid'); + if ($result[0]['success']) { + $ret = $result[0]; } + db_drop_field($ret, 'xmlsitemap_user_role', 'pid'); } - else { - db_create_table($ret, $table, $definition); + $result = array(); + @db_drop_primary_key($result, 'xmlsitemap_user_role'); + if ($result[0]['success']) { + $ret[] = $result[0]; } + db_change_field($ret, 'xmlsitemap_user_role', 'rid', 'rid', + array( + 'description' => 'The role ID.', + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ), + array('primary key' => array('rid')) + ); + $ret[] = update_sql("UPDATE {xmlsitemap_user_role} + SET priority = 0.5 + WHERE priority IS NULL" + ); + db_change_field($ret, 'xmlsitemap_user_role', 'priority', 'priority', + array( + 'description' => t('The priority assigned to the role.'), + 'type' => 'float', + 'not null' => TRUE, + 'default' => 0.5, + ) + ); + db_change_field($ret, 'xmlsitemap_user_role', 'priority', 'priority', + array( + 'description' => t('The priority assigned to the role.'), + 'type' => 'float', + 'not null' => TRUE, + 'default' => 0.5, + ) + ); + } + else { + db_create_table($ret, 'xmlsitemap_user_role', + array( + 'description' => 'The base table for xmlsitemap.', + 'fields' => array( + 'rid' => array( + 'description' => 'The role ID.', + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ), + 'priority' => array( + 'description' => t('The priority assigned to the role.'), + 'type' => 'float', + 'not null' => TRUE, + 'default' => 0.5, + ), + ), + 'primary key' => array('rid'), + ) + ); } return $ret; } /** * Implementation of hook_update_N(). + */ +function xmlsitemap_user_update_6100() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_user_update_6101() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_user_update_6102() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_user_update_6103() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_user_update_6104() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_user_update_6105() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_user_update_6106() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_user_update_6107() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_user_update_6108() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_user_update_6109() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_user_update_6110() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_user_update_6111() { + return array(); +} + +/** + * Implementation of hook_update_N(). + */ +function xmlsitemap_user_update_6112() { + return array(); +} + +/** + * Implementation of hook_update_N(). * */ function xmlsitemap_user_update_6113() { + $ret = xmlsitemap_user_update_6000(); $ret[] = update_sql("UPDATE {system} SET weight = 10 WHERE name = 'xmlsitemap_user'"); return $ret; } @@ -204,8 +408,8 @@ function xmlsitemap_user_update_6113() { * Implementation of hook_update_N(). * */ -function xmlsitemap_user_update_6116() { - return xmlsitemap_user_update_6000(); +function xmlsitemap_user_update_6114() { + return array(); } /** diff -upNr -x CVS -x CHANGELOG.txt -x '.#*' -I '.*\$Id.*' xmlsitemap-DRUPAL-6--1/xmlsitemap_user/xmlsitemap_user.module xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_user/xmlsitemap_user.module --- xmlsitemap-DRUPAL-6--1/xmlsitemap_user/xmlsitemap_user.module 2009-05-26 22:49:14 -0400 +++ xmlsitemap-DRUPAL-6--1-I456736/xmlsitemap_user/xmlsitemap_user.module 2009-05-08 09:32:35 -0400 @@ -19,20 +19,19 @@ * Implementation of hook_cron(). */ function xmlsitemap_user_cron() { - if (user_access('access user profiles', drupal_anonymous_user())) { - $limit = variable_get('xmlsitemap_cron_limit', 200); - $sql = "SELECT u.uid FROM {users} u LEFT JOIN {xmlsitemap_user} xu ON xu.pdata = u.uid WHERE xu.pdata IS NULL AND u.uid <> 0 ORDER BY u.access DESC"; + if (($limit = variable_get('xmlsitemap_cron_limit', 100)) != -1) { + $sql = "SELECT u.* FROM {users} u + LEFT JOIN {xmlsitemap_user} xu ON xu.uid = u.uid + WHERE xu.uid IS NULL + AND u.uid <> 0 + AND u.status <> 0"; $result = db_query_range($sql, 0, $limit); - $row = new stdClass(); - while ($uid = db_result($result)) { - if (($account = user_load($uid)) && $account->status) { - $row->pdata = $uid; - $row->status = $account->access && $account->status; - $row->previously_changed = $account->created; - $row->changed = !empty($account->access) ? $account->access : REQUEST_TIME; - $row->priority = _xmlsitemap_user_get_roles_priority($account); - xmlsitemap_write_link($row, 'xmlsitemap_user'); - } + while ($account = db_fetch_object($result)) { + $row = new stdClass(); + $row->uid = $account->uid; + $row->changed = !empty($account->access) ? $account->access : REQUEST_TIME; + $row->previously_changed = $account->created; + drupal_write_record('xmlsitemap_user', $row); } } } @@ -46,15 +45,15 @@ function xmlsitemap_user_form_user_admin '#type' => 'fieldset', '#title' => t('XML sitemap'), '#collapsible' => TRUE, - '#collapsed' => TRUE, ); } + $default = variable_get('xmlsitemap_user_default_priority', 0.5); $form['xmlsitemap']['xmlsitemap_user_default_priority'] = array( '#type' => 'select', '#title' => t('Default user priority'), '#description' => t('The default priority for users who have only the authenticated user role.'), - '#default_value' => variable_get('xmlsitemap_user_default_priority', 0.5), - '#options' => xmlsitemap_priority_options(TRUE), + '#default_value' => $default, + '#options' => xmlsitemap_priority_options('exclude'), ); $form['buttons']['#weight'] = isset($form['buttons']['#weight']) ? $form['buttons']['#weight'] + 1 : 1; $form['#submit'][] = 'xmlsitemap_user_admin_settings_submit'; @@ -64,8 +63,12 @@ function xmlsitemap_user_form_user_admin * Implementation of hook_form_FORM_ID_alter(). */ function xmlsitemap_user_form_user_admin_role_alter(&$form, &$from_state) { - $options = xmlsitemap_priority_options(TRUE); - if (($priority = db_result(db_query("SELECT priority FROM {xmlsitemap_user_role} WHERE rid = %d", $form['rid']['#value']))) === FALSE) { + $options = xmlsitemap_priority_options('exclude'); + $priority = db_result(db_query("SELECT priority + FROM {xmlsitemap_user_role} + WHERE rid = %d", $form['rid']['#value']) + ); + if ($priority === FALSE) { $priority = 0.5; } if (!isset($form['xmlsitemap'])) { @@ -73,7 +76,6 @@ function xmlsitemap_user_form_user_admin '#type' => 'fieldset', '#title' => t('XML sitemap'), '#collapsible' => TRUE, - '#collapsed' => TRUE, ); } $form['xmlsitemap']['xmlsitemap_user_role_priority'] = array( @@ -98,35 +100,80 @@ function xmlsitemap_user_user($op, &$edi return array(); } case 'register': - $priority_override = db_result(db_query("SELECT priority_override FROM {xmlsitemap_user} WHERE mid = %d", $account->uid)); - $options = xmlsitemap_priority_options(TRUE, TRUE); - $priority = _xmlsitemap_user_get_roles_priority($account); + $priority = db_result(db_query("SELECT priority_override + FROM {xmlsitemap_user} + WHERE uid = %d", $account->uid) + ); + $options = xmlsitemap_priority_options('both'); + if (isset($account->roles)) { + $roles = array_keys($account->roles); + $default = db_fetch_object( + db_query("SELECT MIN(priority) AS min, SUM(priority) AS sum + FROM {xmlsitemap_user_role} + WHERE rid IN (". db_placeholders($roles, 'varchar') .")", + $roles + ) + ); + } + if (isset($default->min) && isset($default->sum)) { + $default_priority = $default->min < 0 ? -1.0 : round(min($default->sum, 1), 1); + } + else { + $default_priority = variable_get('xmlsitemap_user_default_priority', 0.5); + } $form = xmlsitemap_user_form_fieldset(); - $form['xmlsitemap']['xmlsitemap_user_priority_override'] = array( + $form['xmlsitemap']['xmlsitemap_user_priority'] = array( '#type' => 'select', '#title' => t('User priority'), - '#description' => t('The default priority is %priority.', array('%priority' => $options[(string)$priority])), - '#default_value' => $priority_override !== FALSE ? $priority_override : -2.0, + '#description' => t('The default priority is %priority.', array('%priority' => $options[(string)$default_priority])), + '#default_value' => $priority !== FALSE ? $priority : -2.0, '#options' => $options, ); return $form; case 'insert': - case 'update': - $row = new stdClass(); - $row->pdata = $account->uid; - $row->status = $account->access && $account->status && user_access('access user profiles', drupal_anonymous_user()); - $row->previously_changed = $account->created; - $row->changed = !empty($account->access) ? $account->access : REQUEST_TIME; - $row->priority = _xmlsitemap_user_get_roles_priority($account); - $row->priority_override = isset($edit['xmlsitemap_user_priority']) ? $edit['xmlsitemap_user_priority'] : -2.0; - xmlsitemap_write_link($row, 'xmlsitemap_user'); + if ($account->status) { + $row = new stdClass(); + $row->uid = $account->uid; + $row->changed = !empty($account->access) ? $account->access : REQUEST_TIME; + $row->previously_changed = $account->created; + $row->priority_override = isset($edit['xmlsitemap_user_priority']) ? $edit['xmlsitemap_user_priority'] : -2.0; + drupal_write_record('xmlsitemap_user', $row); + $edit['xmlsitemap_user_priority'] = NULL; + xmlsitemap_flag_sitemap(); + } break; - case 'delete': - db_query("DELETE FROM {xmlsitemap_user} WHERE pdata = %d", $account->uid); + case 'update': if ($account->status) { - xmlsitemap_flag_sitemap(TRUE); + if (($result = db_fetch_object(db_query("SELECT uid, changed, previously_changed, priority_override FROM {xmlsitemap_user} WHERE uid = %d", $account->uid))) === FALSE) { + $row = new stdClass(); + $row->uid = $account->uid; + $row->previously_changed = $account->created; + $row->changed = !empty($account->access) ? $account->access : REQUEST_TIME; + } + else { + $row = $result; + if (!empty($account->access)) { + if ($row->changed < $account->access) { + $row->previously_changed = $row->changed; + $row->changed = $account->access; + } + } + else { + $row->previously_changed = $row->changed; + $row->changed = REQUEST_TIME; + } + } + if (isset($edit['xmlsitemap_user_priority'])) { + $row->priority_override = $edit['xmlsitemap_user_priority']; + } + drupal_write_record('xmlsitemap_user', $row, $result !== FALSE ? 'uid' : NULL); + xmlsitemap_flag_sitemap(); } break; + case 'delete': + db_query("DELETE FROM {xmlsitemap_user} WHERE uid = %d", $account->uid); + xmlsitemap_flag_sitemap(); + break; } } @@ -139,33 +186,123 @@ function xmlsitemap_user_xmlsitemap_desc } /** - * Implementation of hook_xmlsitemap_link_count(). + * Implementation of hook_xmlsitemap_links(). */ -function xmlsitemap_user_xmlsitemap_link_count() { - $query = "SELECT COUNT(*) FROM {xmlsitemap_user} WHERE status = 1 AND ((priority >= 0.0 AND priority <= 1.0 AND priority_override = -2.0) OR (priority_override >= 1.0 AND priority_override <= 1.0))"; - return (integer) db_result(db_query($query)); +function xmlsitemap_user_xmlsitemap_links() { + if (user_access('access user profiles')) { + $result = db_query("SELECT u.uid, u.status, xu.changed, xu.previously_changed, xu.priority_override + FROM {xmlsitemap_user} xu + INNER JOIN {users} u ON xu.uid = u.uid" + ); + $row = new stdClass(); + $row->module = 'xmlsitemap_user'; + $row->type = 'user'; + while ($user = db_fetch_object($result)) { + $row->loc = 'user/'. $user->uid; + $row->id = $user->uid; + $row->changed = $user->changed; + $row->changefreq = max(REQUEST_TIME - $user->changed, empty($user->previously_changed) ? 0 : $user->changed - $user->previously_changed); + $priority = xmlsitemap_user_get_priority($user); + $row->priority = $priority == -1 ? $priority : min(max(round($priority, 1), 0.0), 1.0); + $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 == 'user' && $old_row->priority != $priority) { + $row->lid = $old_row->lid; + drupal_write_record('xmlsitemap', $row, 'lid'); + } + } + } } +/***************************************************************************** + * Public functions. + ****************************************************************************/ + /** - * Implementation of hook_xmlsitemap_links(). + * Get the user priority in the sitemap. + * @param $user + * The user object. + * @param $load + * TRUE, if priority_override must be loaded from the module table. + * @return + * The priority for the user. + * @see xmlsitemap_user_set_priority() + */ +function xmlsitemap_user_get_priority($user, $load = FALSE) { + if (!isset($user->priority_override) && $load && $user->uid) { + $priority_override = db_result(db_query("SELECT xu.priority_override FROM {xmlsitemap_user} xu WHERE xu.uid = %d", $user->uid)); + if ($priority_override !== FALSE) { + $user->priority_override = $priority_override; + } + } + if (isset($user->priority_override) && $user->priority_override != -2.0) { + $priority = $user->priority_override; + } + else { + $default = db_fetch_object( + db_query("SELECT MIN(xur.priority) AS min, SUM(xur.priority) AS sum + FROM {users_roles} ur + INNER JOIN {xmlsitemap_user_role} xur ON xur.rid = ur.rid + WHERE ur.uid = %d", $user->uid + ) + ); + if (isset($default->min) && isset($default->sum)) { + $priority = $default->min < 0 ? -1.0 : round(min($default->sum, 1.0), 1); + } + else { + $priority = variable_get('xmlsitemap_user_default_priority', 0.5); + } + } + if (!isset($priority) || !$user->status) { + $priority = -1.0; + } + return $priority; +} + +/** + * Set the user priority in the sitemap. It doesn't change the priority of a + * blocked user. + * @param $user + * The user object, or the user ID. + * @param $priority + * The priority for the user. + * @return + * The user object, or FALSE. */ -function xmlsitemap_user_xmlsitemap_links($fp, $from, $count = 0) { - $link = new stdClass(); - $query = "SELECT * FROM {xmlsitemap_user} WHERE status = 1 AND ((priority >= 0.0 AND priority <= 1.0 AND priority_override = -2.0) OR (priority_override >= 1.0 AND priority_override <= 1.0)) ORDER BY changed DESC, previously_changed DESC"; - if ($count) { - $result = db_query_range($query, $from, $count); +function xmlsitemap_user_set_priority($user, $priority) { + if (!is_numeric($user)) { + $user = (object) $user; + $uid = $user->uid; } else { - $result = db_query($query); + $uid = $user; + $user = user_load($uid); } - while ($row = db_fetch_object($result)) { - $changefreq = max($row->changed - $row->previously_changed, REQUEST_TIME - $row->changed); - $link->loc = url('user/'. $row->pdata, array('absolute' => TRUE)); - $link->changed = $row->changed; - $link->changefreq = $changefreq; - $link->priority = $row->priority_override == -2.0 ? $row->priority : $row->priority_override; - xmlsitemap_output_link($fp, $link); + if ($user && $user->status) { + $result = db_fetch_object(db_query("SELECT uid, changed, previously_changed, priority_override + FROM {xmlsitemap_user} + WHERE uid = %d", $uid) + ); + if ($result === FALSE) { + $row = new stdClass(); + $row->uid = $user->uid; + $row->changed = $user->access; + $row->previously_changed = $user->created; + } + else { + $row = $result; + if ($row->changed < $user->access) { + $row->previously_changed = $row->changed; + $row->changed = $user->access; + } + } + $row->priority_override = $priority; + drupal_write_record('xmlsitemap_user', $row, $result === FALSE ? NULL : 'uid'); + return $user; } + return FALSE; } /***************************************************************************** @@ -176,54 +313,20 @@ function xmlsitemap_user_xmlsitemap_link * Form submit function. */ function xmlsitemap_user_admin_role_submit($form, &$form_state) { - db_query("UPDATE {xmlsitemap_user_role} SET priority = %f WHERE rid = %d", - $form_state['values']['xmlsitemap_user_role_priority'], - $form_state['values']['rid'] - ); - if (!db_affected_rows()) { - $row = new stdClass(); - $row->rid = $form_state['values']['rid']; - $row->priority = $form_state['values']['xmlsitemap_user_role_priority']; - drupal_write_record('xmlsitemap_user_role', $row); - } - xmlsitemap_flag_sitemap(TRUE); + $form_values = $form_state['values']; + $priority = db_result(db_query("SELECT priority FROM {xmlsitemap_user_role} WHERE rid = %d", $form_values['rid'])); + $row = new stdClass(); + $row->rid = $form_values['rid']; + $row->priority = $form_values['xmlsitemap_user_role_priority']; + drupal_write_record('xmlsitemap_user_role', $row, $priority !== FALSE ? 'rid' : NULL); + xmlsitemap_flag_sitemap(); } /** * Form submit function. */ function xmlsitemap_user_admin_settings_submit($form, &$form_state) { - xmlsitemap_flag_sitemap(TRUE); -} - -/***************************************************************************** - * Private functions. - ****************************************************************************/ - -/** - * Return the user priority calculated from the roles he has. - * @param $user - * A user object. - * @return - * The priority of the user object calculated from the roles. - */ -function _xmlsitemap_user_get_roles_priority($user) { - if (isset($user->roles)) { - $roles = array_keys($user->roles); - $roles_priority = db_fetch_object( - db_query("SELECT MIN(priority) AS min, SUM(priority) AS sum - FROM {xmlsitemap_user_role} - WHERE rid IN (". db_placeholders($roles, 'varchar') .")", $roles - ) - ); - } - if (isset($roles_priority->min) && isset($roles_priority->sum)) { - $priority = $roles_priority->min < 0 ? -1.0 : round(min($roles_priority->sum, 1), 1); - } - else { - $priority = variable_get('xmlsitemap_user_default_priority', 0.5); - } - return $priority; + xmlsitemap_flag_sitemap(); } /**