[Pkg-drupal-commits] r1919 - in /branches/upstream/current-6: ./ includes/ modules/aggregator/ modules/block/ modules/blog/ modules/blogapi/ modules/book/ modules/color/ modules/comment/ modules/contact/ modules/dblog/ modules/filter/ modules/forum/ modules/help/ modules/locale/ modules/menu/ modules/node/ modules/openid/ modules/path/ modules/php/ modules/ping/ modules/poll/ modules/profile/ modules/search/ modules/statistics/ modules/syslog/ modules/system/ modules/taxonomy/ modules/throttle/ modules/tracker/ modules/translation/ modules/trigger/ modules/update/ modules/upload/ modules/user/ sites/default/ themes/bluemarine/ themes/chameleon/ themes/chameleon/marvin/ themes/garland/ themes/garland/minnelli/ themes/pushbutton/
luigi at users.alioth.debian.org
luigi at users.alioth.debian.org
Thu Aug 14 23:34:55 UTC 2008
Author: luigi
Date: Thu Aug 14 23:34:55 2008
New Revision: 1919
URL: http://svn.debian.org/wsvn/pkg-drupal/?sc=1&rev=1919
Log:
[svn-upgrade] Integrating new upstream version, drupal6 (6.4)
Modified:
branches/upstream/current-6/CHANGELOG.txt
branches/upstream/current-6/includes/actions.inc
branches/upstream/current-6/includes/common.inc
branches/upstream/current-6/includes/file.inc
branches/upstream/current-6/includes/form.inc
branches/upstream/current-6/includes/session.inc
branches/upstream/current-6/install.php
branches/upstream/current-6/modules/aggregator/aggregator.info
branches/upstream/current-6/modules/aggregator/aggregator.module
branches/upstream/current-6/modules/block/block.info
branches/upstream/current-6/modules/blog/blog.info
branches/upstream/current-6/modules/blogapi/blogapi.info
branches/upstream/current-6/modules/blogapi/blogapi.install
branches/upstream/current-6/modules/blogapi/blogapi.module
branches/upstream/current-6/modules/book/book.info
branches/upstream/current-6/modules/book/book.pages.inc
branches/upstream/current-6/modules/color/color.info
branches/upstream/current-6/modules/comment/comment.info
branches/upstream/current-6/modules/contact/contact.info
branches/upstream/current-6/modules/dblog/dblog.info
branches/upstream/current-6/modules/filter/filter.info
branches/upstream/current-6/modules/filter/filter.module
branches/upstream/current-6/modules/forum/forum.info
branches/upstream/current-6/modules/help/help.info
branches/upstream/current-6/modules/locale/locale.info
branches/upstream/current-6/modules/menu/menu.info
branches/upstream/current-6/modules/node/node.info
branches/upstream/current-6/modules/openid/openid.info
branches/upstream/current-6/modules/path/path.info
branches/upstream/current-6/modules/php/php.info
branches/upstream/current-6/modules/ping/ping.info
branches/upstream/current-6/modules/poll/poll.info
branches/upstream/current-6/modules/poll/poll.module
branches/upstream/current-6/modules/profile/profile.info
branches/upstream/current-6/modules/search/search.info
branches/upstream/current-6/modules/search/search.module
branches/upstream/current-6/modules/statistics/statistics.info
branches/upstream/current-6/modules/syslog/syslog.info
branches/upstream/current-6/modules/syslog/syslog.module
branches/upstream/current-6/modules/system/system.info
branches/upstream/current-6/modules/system/system.module
branches/upstream/current-6/modules/taxonomy/taxonomy.info
branches/upstream/current-6/modules/throttle/throttle.info
branches/upstream/current-6/modules/tracker/tracker.info
branches/upstream/current-6/modules/translation/translation.info
branches/upstream/current-6/modules/trigger/trigger.info
branches/upstream/current-6/modules/update/update.compare.inc
branches/upstream/current-6/modules/update/update.info
branches/upstream/current-6/modules/upload/upload.info
branches/upstream/current-6/modules/upload/upload.module
branches/upstream/current-6/modules/user/user.admin.inc
branches/upstream/current-6/modules/user/user.info
branches/upstream/current-6/modules/user/user.module
branches/upstream/current-6/sites/default/default.settings.php
branches/upstream/current-6/themes/bluemarine/bluemarine.info
branches/upstream/current-6/themes/chameleon/chameleon.info
branches/upstream/current-6/themes/chameleon/marvin/marvin.info
branches/upstream/current-6/themes/garland/garland.info
branches/upstream/current-6/themes/garland/minnelli/minnelli.info
branches/upstream/current-6/themes/pushbutton/pushbutton.info
Modified: branches/upstream/current-6/CHANGELOG.txt
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/CHANGELOG.txt?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/CHANGELOG.txt (original)
+++ branches/upstream/current-6/CHANGELOG.txt Thu Aug 14 23:34:55 2008
@@ -1,24 +1,35 @@
-// $Id: CHANGELOG.txt,v 1.253.2.9 2008/07/09 21:48:27 goba Exp $
+// $Id: CHANGELOG.txt,v 1.253.2.11 2008/08/13 23:59:12 drumm Exp $
+
+Drupal 6.4, 2008-08-13
+----------------------
+- Fixed a security issue (Cross site scripting, Arbitrary file uploads via
+ BlogAPI, Cross site request forgeries and Various Upload module
+ vulnerabilities), see SA-2008-047.
+- Improved error messages during installation.
+- Fixed a bug that prevented AHAH handlers to be attached to radios widgets.
+- Fixed a variety of small bugs.
Drupal 6.3, 2008-07-09
----------------------
-- fixed security issues, (Cross site scripting, cross site request forgery, session fixation and SQL injection), see SA-2008-044
-- slightly modified installation process to prevent file ownership issues on shared hosts
-- improved PostgreSQL compatibility (rewritten queries; custom blocks)
-- upgraded to jQuery 1.2.6
-- performance improvements to search, menu handling and form API caches
-- fixed Views compatibility issues (Views for Drupal 6 requires Drupal 6.3+)
-- fixed a variety of small bugs.
+- Fixed security issues, (Cross site scripting, cross site request forgery,
+ session fixation and SQL injection), see SA-2008-044.
+- Slightly modified installation process to prevent file ownership issues on
+ shared hosts.
+- Improved PostgreSQL compatibility (rewritten queries; custom blocks).
+- Upgraded to jQuery 1.2.6.
+- Performance improvements to search, menu handling and form API caches.
+- Fixed Views compatibility issues (Views for Drupal 6 requires Drupal 6.3+).
+- Fixed a variety of small bugs.
Drupal 6.2, 2008-04-09
----------------------
-- fixed a variety of small bugs
-- fixed a security issue (Access bypasses), see SA-2008-026
+- Fixed a variety of small bugs.
+- Fixed a security issue (Access bypasses), see SA-2008-026.
Drupal 6.1, 2008-02-27
----------------------
-- fixed a variety of small bugs.
-- fixed a security issue (Cross site scripting), see SA-2008-018
+- Fixed a variety of small bugs.
+- Fixed a security issue (Cross site scripting), see SA-2008-018.
Drupal 6.0, 2008-02-13
----------------------
@@ -120,10 +131,22 @@
- Removed old system updates. Updates from Drupal versions prior to 5.x will
require upgrading to 5.x before upgrading to 6.x.
+Drupal 5.10, 2008-08-13
+-----------------------
+- fixed a variety of small bugs.
+- fixed security issues, (Cross site scripting, Arbitrary file uploads via
+ BlogAPI and Cross site request forgery), see SA-2008-047
+
+Drupal 5.9, 2008-07-23
+----------------------
+- fixed a variety of small bugs.
+- fixed security issues, (Session fixation), see SA-2008-046
+
Drupal 5.8, 2008-07-09
----------------------
- fixed a variety of small bugs.
-- fixed security issues, (Cross site scripting, cross site request forgery, and session fixation), see SA-2008-044
+- fixed security issues, (Cross site scripting, cross site request forgery, and
+ session fixation), see SA-2008-044
Drupal 5.7, 2008-01-28
----------------------
Modified: branches/upstream/current-6/includes/actions.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/actions.inc?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/includes/actions.inc (original)
+++ branches/upstream/current-6/includes/actions.inc Thu Aug 14 23:34:55 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: actions.inc,v 1.8.2.1 2008/04/23 18:06:36 dries Exp $
+// $Id: actions.inc,v 1.8.2.3 2008/08/12 06:57:31 dries Exp $
/**
* @file
@@ -11,7 +11,7 @@
*
* Given the IDs of actions to perform, find out what the callbacks
* for the actions are by querying the database. Then call each callback
- * using the function call $function($object, $context, $a1, $2)
+ * using the function call $function($object, $context, $a1, $a2)
* where $function is the name of a function written in compliance with
* the action specification; that is, foo($object, $context).
*
@@ -300,7 +300,7 @@
else {
$link = l(t('Remove orphaned actions'), 'admin/build/actions/orphan');
$count = count($actions_in_db);
- watchdog('actions', format_plural($count, 'One orphaned action (%orphans) exists in the actions table. !link', '@count orphaned actions (%orphans) exist in the actions table. !link', array('@count' => $count, '%orphans' => $orphans, '!link' => $link), 'warning'));
+ watchdog('actions', format_plural($count, 'One orphaned action (%orphans) exists in the actions table. !link', '@count orphaned actions (%orphans) exist in the actions table. !link'), array('@count' => $count, '%orphans' => $orphans, '!link' => $link), WATCHDOG_WARNING);
}
}
}
Modified: branches/upstream/current-6/includes/common.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/common.inc?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/includes/common.inc (original)
+++ branches/upstream/current-6/includes/common.inc Thu Aug 14 23:34:55 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: common.inc,v 1.756.2.20 2008/07/09 21:48:27 goba Exp $
+// $Id: common.inc,v 1.756.2.24 2008/08/13 23:59:12 drumm Exp $
/**
* @file
@@ -434,6 +434,16 @@
// Parse the URL and make sure we can handle the schema.
$uri = parse_url($url);
+
+ if ($uri == FALSE) {
+ $result->error = 'unable to parse URL';
+ return $result;
+ }
+
+ if (!isset($uri['scheme'])) {
+ $result->error = 'missing schema';
+ return $result;
+ }
switch ($uri['scheme']) {
case 'http':
@@ -3234,7 +3244,7 @@
if (empty($schema)) {
return FALSE;
}
-
+
// Convert to an object if needed.
if (is_array($object)) {
$object = (object) $object;
Modified: branches/upstream/current-6/includes/file.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/file.inc?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/includes/file.inc (original)
+++ branches/upstream/current-6/includes/file.inc Thu Aug 14 23:34:55 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: file.inc,v 1.121.2.2 2008/04/23 18:18:09 dries Exp $
+// $Id: file.inc,v 1.121.2.3 2008/08/13 23:59:12 drumm Exp $
/**
* @file
@@ -527,7 +527,7 @@
$file = new stdClass();
$file->filename = file_munge_filename(trim(basename($_FILES['files']['name'][$source]), '.'), $extensions);
$file->filepath = $_FILES['files']['tmp_name'][$source];
- $file->filemime = $_FILES['files']['type'][$source];
+ $file->filemime = file_get_mimetype($file->filename);
// Rename potentially executable files, to help prevent exploits.
if (preg_match('/\.(php|pl|py|cgi|asp|js)$/i', $file->filename) && (substr($file->filename, -4) != '.txt')) {
@@ -980,5 +980,377 @@
}
/**
+ * Determine an Internet Media Type, or MIME type from a filename.
+ *
+ * @param $filename
+ * Name of the file, including extension.
+ * @param $mapping
+ * An optional array of extension to media type mappings in the form
+ * 'extension1|extension2|...' => 'type'.
+ *
+ * @return
+ * The internet media type registered for the extension or application/octet-stream for unknown extensions.
+ */
+function file_get_mimetype($filename, $mapping = NULL) {
+ if (!is_array($mapping)) {
+ $mapping = variable_get('mime_extension_mapping', array(
+ 'ez' => 'application/andrew-inset',
+ 'atom' => 'application/atom',
+ 'atomcat' => 'application/atomcat+xml',
+ 'atomsrv' => 'application/atomserv+xml',
+ 'cap|pcap' => 'application/cap',
+ 'cu' => 'application/cu-seeme',
+ 'tsp' => 'application/dsptype',
+ 'spl' => 'application/x-futuresplash',
+ 'hta' => 'application/hta',
+ 'jar' => 'application/java-archive',
+ 'ser' => 'application/java-serialized-object',
+ 'class' => 'application/java-vm',
+ 'hqx' => 'application/mac-binhex40',
+ 'cpt' => 'image/x-corelphotopaint',
+ 'nb' => 'application/mathematica',
+ 'mdb' => 'application/msaccess',
+ 'doc|dot' => 'application/msword',
+ 'bin' => 'application/octet-stream',
+ 'oda' => 'application/oda',
+ 'ogg|ogx' => 'application/ogg',
+ 'pdf' => 'application/pdf',
+ 'key' => 'application/pgp-keys',
+ 'pgp' => 'application/pgp-signature',
+ 'prf' => 'application/pics-rules',
+ 'ps|ai|eps' => 'application/postscript',
+ 'rar' => 'application/rar',
+ 'rdf' => 'application/rdf+xml',
+ 'rss' => 'application/rss+xml',
+ 'rtf' => 'application/rtf',
+ 'smi|smil' => 'application/smil',
+ 'wpd' => 'application/wordperfect',
+ 'wp5' => 'application/wordperfect5.1',
+ 'xhtml|xht' => 'application/xhtml+xml',
+ 'xml|xsl' => 'application/xml',
+ 'zip' => 'application/zip',
+ 'cdy' => 'application/vnd.cinderella',
+ 'kml' => 'application/vnd.google-earth.kml+xml',
+ 'kmz' => 'application/vnd.google-earth.kmz',
+ 'xul' => 'application/vnd.mozilla.xul+xml',
+ 'xls|xlb|xlt' => 'application/vnd.ms-excel',
+ 'cat' => 'application/vnd.ms-pki.seccat',
+ 'stl' => 'application/vnd.ms-pki.stl',
+ 'ppt|pps' => 'application/vnd.ms-powerpoint',
+ 'odc' => 'application/vnd.oasis.opendocument.chart',
+ 'odb' => 'application/vnd.oasis.opendocument.database',
+ 'odf' => 'application/vnd.oasis.opendocument.formula',
+ 'odg' => 'application/vnd.oasis.opendocument.graphics',
+ 'otg' => 'application/vnd.oasis.opendocument.graphics-template',
+ 'odi' => 'application/vnd.oasis.opendocument.image',
+ 'odp' => 'application/vnd.oasis.opendocument.presentation',
+ 'otp' => 'application/vnd.oasis.opendocument.presentation-template',
+ 'ods' => 'application/vnd.oasis.opendocument.spreadsheet',
+ 'ots' => 'application/vnd.oasis.opendocument.spreadsheet-template',
+ 'odt' => 'application/vnd.oasis.opendocument.text',
+ 'odm' => 'application/vnd.oasis.opendocument.text-master',
+ 'ott' => 'application/vnd.oasis.opendocument.text-template',
+ 'oth' => 'application/vnd.oasis.opendocument.text-web',
+ 'docm' => 'application/vnd.ms-word.document.macroEnabled.12',
+ 'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+ 'dotm' => 'application/vnd.ms-word.template.macroEnabled.12',
+ 'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
+ 'potm' => 'application/vnd.ms-powerpoint.template.macroEnabled.12',
+ 'potx' => 'application/vnd.openxmlformats-officedocument.presentationml.template',
+ 'ppam' => 'application/vnd.ms-powerpoint.addin.macroEnabled.12',
+ 'ppsm' => 'application/vnd.ms-powerpoint.slideshow.macroEnabled.12',
+ 'ppsx' => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
+ 'pptm' => 'application/vnd.ms-powerpoint.presentation.macroEnabled.12',
+ 'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+ 'xlam' => 'application/vnd.ms-excel.addin.macroEnabled.12',
+ 'xlsb' => 'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
+ 'xlsm' => 'application/vnd.ms-excel.sheet.macroEnabled.12',
+ 'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+ 'xltm' => 'application/vnd.ms-excel.template.macroEnabled.12',
+ 'xltx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
+ 'cod' => 'application/vnd.rim.cod',
+ 'mmf' => 'application/vnd.smaf',
+ 'sdc' => 'application/vnd.stardivision.calc',
+ 'sds' => 'application/vnd.stardivision.chart',
+ 'sda' => 'application/vnd.stardivision.draw',
+ 'sdd' => 'application/vnd.stardivision.impress',
+ 'sdf' => 'application/vnd.stardivision.math',
+ 'sdw' => 'application/vnd.stardivision.writer',
+ 'sgl' => 'application/vnd.stardivision.writer-global',
+ 'sxc' => 'application/vnd.sun.xml.calc',
+ 'stc' => 'application/vnd.sun.xml.calc.template',
+ 'sxd' => 'application/vnd.sun.xml.draw',
+ 'std' => 'application/vnd.sun.xml.draw.template',
+ 'sxi' => 'application/vnd.sun.xml.impress',
+ 'sti' => 'application/vnd.sun.xml.impress.template',
+ 'sxm' => 'application/vnd.sun.xml.math',
+ 'sxw' => 'application/vnd.sun.xml.writer',
+ 'sxg' => 'application/vnd.sun.xml.writer.global',
+ 'stw' => 'application/vnd.sun.xml.writer.template',
+ 'sis' => 'application/vnd.symbian.install',
+ 'vsd' => 'application/vnd.visio',
+ 'wbxml' => 'application/vnd.wap.wbxml',
+ 'wmlc' => 'application/vnd.wap.wmlc',
+ 'wmlsc' => 'application/vnd.wap.wmlscriptc',
+ 'wk' => 'application/x-123',
+ '7z' => 'application/x-7z-compressed',
+ 'abw' => 'application/x-abiword',
+ 'dmg' => 'application/x-apple-diskimage',
+ 'bcpio' => 'application/x-bcpio',
+ 'torrent' => 'application/x-bittorrent',
+ 'cab' => 'application/x-cab',
+ 'cbr' => 'application/x-cbr',
+ 'cbz' => 'application/x-cbz',
+ 'cdf' => 'application/x-cdf',
+ 'vcd' => 'application/x-cdlink',
+ 'pgn' => 'application/x-chess-pgn',
+ 'cpio' => 'application/x-cpio',
+ 'csh' => 'text/x-csh',
+ 'deb|udeb' => 'application/x-debian-package',
+ 'dcr|dir|dxr' => 'application/x-director',
+ 'dms' => 'application/x-dms',
+ 'wad' => 'application/x-doom',
+ 'dvi' => 'application/x-dvi',
+ 'rhtml' => 'application/x-httpd-eruby',
+ 'flac' => 'application/x-flac',
+ 'pfa|pfb|gsf|pcf|pcf.Z' => 'application/x-font',
+ 'mm' => 'application/x-freemind',
+ 'gnumeric' => 'application/x-gnumeric',
+ 'sgf' => 'application/x-go-sgf',
+ 'gcf' => 'application/x-graphing-calculator',
+ 'gtar|tgz|taz' => 'application/x-gtar',
+ 'hdf' => 'application/x-hdf',
+ 'phtml|pht|php' => 'application/x-httpd-php',
+ 'phps' => 'application/x-httpd-php-source',
+ 'php3' => 'application/x-httpd-php3',
+ 'php3p' => 'application/x-httpd-php3-preprocessed',
+ 'php4' => 'application/x-httpd-php4',
+ 'ica' => 'application/x-ica',
+ 'ins|isp' => 'application/x-internet-signup',
+ 'iii' => 'application/x-iphone',
+ 'iso' => 'application/x-iso9660-image',
+ 'jnlp' => 'application/x-java-jnlp-file',
+ 'js' => 'application/x-javascript',
+ 'jmz' => 'application/x-jmol',
+ 'chrt' => 'application/x-kchart',
+ 'kil' => 'application/x-killustrator',
+ 'skp|skd|skt|skm' => 'application/x-koan',
+ 'kpr|kpt' => 'application/x-kpresenter',
+ 'ksp' => 'application/x-kspread',
+ 'kwd|kwt' => 'application/x-kword',
+ 'latex' => 'application/x-latex',
+ 'lha' => 'application/x-lha',
+ 'lyx' => 'application/x-lyx',
+ 'lzh' => 'application/x-lzh',
+ 'lzx' => 'application/x-lzx',
+ 'frm|maker|frame|fm|fb|book|fbdoc' => 'application/x-maker',
+ 'mif' => 'application/x-mif',
+ 'wmd' => 'application/x-ms-wmd',
+ 'wmz' => 'application/x-ms-wmz',
+ 'com|exe|bat|dll' => 'application/x-msdos-program',
+ 'msi' => 'application/x-msi',
+ 'nc' => 'application/x-netcdf',
+ 'pac' => 'application/x-ns-proxy-autoconfig',
+ 'nwc' => 'application/x-nwc',
+ 'o' => 'application/x-object',
+ 'oza' => 'application/x-oz-application',
+ 'p7r' => 'application/x-pkcs7-certreqresp',
+ 'crl' => 'application/x-pkcs7-crl',
+ 'pyc|pyo' => 'application/x-python-code',
+ 'qtl' => 'application/x-quicktimeplayer',
+ 'rpm' => 'application/x-redhat-package-manager',
+ 'sh' => 'text/x-sh',
+ 'shar' => 'application/x-shar',
+ 'swf|swfl' => 'application/x-shockwave-flash',
+ 'sit|sitx' => 'application/x-stuffit',
+ 'sv4cpio' => 'application/x-sv4cpio',
+ 'sv4crc' => 'application/x-sv4crc',
+ 'tar' => 'application/x-tar',
+ 'tcl' => 'application/x-tcl',
+ 'gf' => 'application/x-tex-gf',
+ 'pk' => 'application/x-tex-pk',
+ 'texinfo|texi' => 'application/x-texinfo',
+ '~|%|bak|old|sik' => 'application/x-trash',
+ 't|tr|roff' => 'application/x-troff',
+ 'man' => 'application/x-troff-man',
+ 'me' => 'application/x-troff-me',
+ 'ms' => 'application/x-troff-ms',
+ 'ustar' => 'application/x-ustar',
+ 'src' => 'application/x-wais-source',
+ 'wz' => 'application/x-wingz',
+ 'crt' => 'application/x-x509-ca-cert',
+ 'xcf' => 'application/x-xcf',
+ 'fig' => 'application/x-xfig',
+ 'xpi' => 'application/x-xpinstall',
+ 'au|snd' => 'audio/basic',
+ 'mid|midi|kar' => 'audio/midi',
+ 'mpga|mpega|mp2|mp3|m4a' => 'audio/mpeg',
+ 'm3u' => 'audio/x-mpegurl',
+ 'oga|spx' => 'audio/ogg',
+ 'sid' => 'audio/prs.sid',
+ 'aif|aiff|aifc' => 'audio/x-aiff',
+ 'gsm' => 'audio/x-gsm',
+ 'wma' => 'audio/x-ms-wma',
+ 'wax' => 'audio/x-ms-wax',
+ 'ra|rm|ram' => 'audio/x-pn-realaudio',
+ 'ra' => 'audio/x-realaudio',
+ 'pls' => 'audio/x-scpls',
+ 'sd2' => 'audio/x-sd2',
+ 'wav' => 'audio/x-wav',
+ 'alc' => 'chemical/x-alchemy',
+ 'cac|cache' => 'chemical/x-cache',
+ 'csf' => 'chemical/x-cache-csf',
+ 'cbin|cascii|ctab' => 'chemical/x-cactvs-binary',
+ 'cdx' => 'chemical/x-cdx',
+ 'cer' => 'chemical/x-cerius',
+ 'c3d' => 'chemical/x-chem3d',
+ 'chm' => 'chemical/x-chemdraw',
+ 'cif' => 'chemical/x-cif',
+ 'cmdf' => 'chemical/x-cmdf',
+ 'cml' => 'chemical/x-cml',
+ 'cpa' => 'chemical/x-compass',
+ 'bsd' => 'chemical/x-crossfire',
+ 'csml|csm' => 'chemical/x-csml',
+ 'ctx' => 'chemical/x-ctx',
+ 'cxf|cef' => 'chemical/x-cxf',
+ 'emb|embl' => 'chemical/x-embl-dl-nucleotide',
+ 'spc' => 'chemical/x-galactic-spc',
+ 'inp|gam|gamin' => 'chemical/x-gamess-input',
+ 'fch|fchk' => 'chemical/x-gaussian-checkpoint',
+ 'cub' => 'chemical/x-gaussian-cube',
+ 'gau|gjc|gjf' => 'chemical/x-gaussian-input',
+ 'gal' => 'chemical/x-gaussian-log',
+ 'gcg' => 'chemical/x-gcg8-sequence',
+ 'gen' => 'chemical/x-genbank',
+ 'hin' => 'chemical/x-hin',
+ 'istr|ist' => 'chemical/x-isostar',
+ 'jdx|dx' => 'chemical/x-jcamp-dx',
+ 'kin' => 'chemical/x-kinemage',
+ 'mcm' => 'chemical/x-macmolecule',
+ 'mmd|mmod' => 'chemical/x-macromodel-input',
+ 'mol' => 'chemical/x-mdl-molfile',
+ 'rd' => 'chemical/x-mdl-rdfile',
+ 'rxn' => 'chemical/x-mdl-rxnfile',
+ 'sd|sdf' => 'chemical/x-mdl-sdfile',
+ 'tgf' => 'chemical/x-mdl-tgf',
+ 'mcif' => 'chemical/x-mmcif',
+ 'mol2' => 'chemical/x-mol2',
+ 'b' => 'chemical/x-molconn-Z',
+ 'gpt' => 'chemical/x-mopac-graph',
+ 'mop|mopcrt|mpc|dat|zmt' => 'chemical/x-mopac-input',
+ 'moo' => 'chemical/x-mopac-out',
+ 'mvb' => 'chemical/x-mopac-vib',
+ 'asn' => 'chemical/x-ncbi-asn1-spec',
+ 'prt|ent' => 'chemical/x-ncbi-asn1-ascii',
+ 'val|aso' => 'chemical/x-ncbi-asn1-binary',
+ 'pdb|ent' => 'chemical/x-pdb',
+ 'ros' => 'chemical/x-rosdal',
+ 'sw' => 'chemical/x-swissprot',
+ 'vms' => 'chemical/x-vamas-iso14976',
+ 'vmd' => 'chemical/x-vmd',
+ 'xtel' => 'chemical/x-xtel',
+ 'xyz' => 'chemical/x-xyz',
+ 'gif' => 'image/gif',
+ 'ief' => 'image/ief',
+ 'jpeg|jpg|jpe' => 'image/jpeg',
+ 'pcx' => 'image/pcx',
+ 'png' => 'image/png',
+ 'svg|svgz' => 'image/svg+xml',
+ 'tiff|tif' => 'image/tiff',
+ 'djvu|djv' => 'image/vnd.djvu',
+ 'wbmp' => 'image/vnd.wap.wbmp',
+ 'ras' => 'image/x-cmu-raster',
+ 'cdr' => 'image/x-coreldraw',
+ 'pat' => 'image/x-coreldrawpattern',
+ 'cdt' => 'image/x-coreldrawtemplate',
+ 'ico' => 'image/x-icon',
+ 'art' => 'image/x-jg',
+ 'jng' => 'image/x-jng',
+ 'bmp' => 'image/x-ms-bmp',
+ 'psd' => 'image/x-photoshop',
+ 'pnm' => 'image/x-portable-anymap',
+ 'pbm' => 'image/x-portable-bitmap',
+ 'pgm' => 'image/x-portable-graymap',
+ 'ppm' => 'image/x-portable-pixmap',
+ 'rgb' => 'image/x-rgb',
+ 'xbm' => 'image/x-xbitmap',
+ 'xpm' => 'image/x-xpixmap',
+ 'xwd' => 'image/x-xwindowdump',
+ 'eml' => 'message/rfc822',
+ 'igs|iges' => 'model/iges',
+ 'msh|mesh|silo' => 'model/mesh',
+ 'wrl|vrml' => 'model/vrml',
+ 'ics|icz' => 'text/calendar',
+ 'css' => 'text/css',
+ 'csv' => 'text/csv',
+ '323' => 'text/h323',
+ 'html|htm|shtml' => 'text/html',
+ 'uls' => 'text/iuls',
+ 'mml' => 'text/mathml',
+ 'asc|txt|text|pot' => 'text/plain',
+ 'rtx' => 'text/richtext',
+ 'sct|wsc' => 'text/scriptlet',
+ 'tm|ts' => 'text/texmacs',
+ 'tsv' => 'text/tab-separated-values',
+ 'jad' => 'text/vnd.sun.j2me.app-descriptor',
+ 'wml' => 'text/vnd.wap.wml',
+ 'wmls' => 'text/vnd.wap.wmlscript',
+ 'bib' => 'text/x-bibtex',
+ 'boo' => 'text/x-boo',
+ 'h++|hpp|hxx|hh' => 'text/x-c++hdr',
+ 'c++|cpp|cxx|cc' => 'text/x-c++src',
+ 'h' => 'text/x-chdr',
+ 'htc' => 'text/x-component',
+ 'c' => 'text/x-csrc',
+ 'd' => 'text/x-dsrc',
+ 'diff|patch' => 'text/x-diff',
+ 'hs' => 'text/x-haskell',
+ 'java' => 'text/x-java',
+ 'lhs' => 'text/x-literate-haskell',
+ 'moc' => 'text/x-moc',
+ 'p|pas' => 'text/x-pascal',
+ 'gcd' => 'text/x-pcs-gcd',
+ 'pl|pm' => 'text/x-perl',
+ 'py' => 'text/x-python',
+ 'etx' => 'text/x-setext',
+ 'tcl|tk' => 'text/x-tcl',
+ 'tex|ltx|sty|cls' => 'text/x-tex',
+ 'vcs' => 'text/x-vcalendar',
+ 'vcf' => 'text/x-vcard',
+ '3gp' => 'video/3gpp',
+ 'dl' => 'video/dl',
+ 'dif|dv' => 'video/dv',
+ 'fli' => 'video/fli',
+ 'gl' => 'video/gl',
+ 'mpeg|mpg|mpe' => 'video/mpeg',
+ 'mp4' => 'video/mp4',
+ 'ogv' => 'video/ogg',
+ 'qt|mov' => 'video/quicktime',
+ 'mxu' => 'video/vnd.mpegurl',
+ 'lsf|lsx' => 'video/x-la-asf',
+ 'mng' => 'video/x-mng',
+ 'asf|asx' => 'video/x-ms-asf',
+ 'wm' => 'video/x-ms-wm',
+ 'wmv' => 'video/x-ms-wmv',
+ 'wmx' => 'video/x-ms-wmx',
+ 'wvx' => 'video/x-ms-wvx',
+ 'avi' => 'video/x-msvideo',
+ 'movie' => 'video/x-sgi-movie',
+ 'ice' => 'x-conference/x-cooltalk',
+ 'sisx' => 'x-epoc/x-sisx-app',
+ 'vrm|vrml|wrl' => 'x-world/x-vrml',
+ 'xps' => 'application/vnd.ms-xpsdocument',
+ ));
+ }
+ foreach ($mapping as $ext_preg => $mime_match) {
+ if (preg_match('!\.('. $ext_preg .')$!i', $filename)) {
+ return $mime_match;
+ }
+ }
+
+ return 'application/octet-stream';
+}
+
+/**
* @} End of "defgroup file".
*/
Modified: branches/upstream/current-6/includes/form.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/form.inc?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/includes/form.inc (original)
+++ branches/upstream/current-6/includes/form.inc Thu Aug 14 23:34:55 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: form.inc,v 1.265.2.7 2008/06/25 09:58:09 dries Exp $
+// $Id: form.inc,v 1.265.2.10 2008/08/13 23:59:12 drumm Exp $
/**
* @defgroup forms Form builder functions
@@ -100,7 +100,7 @@
array_unshift($args_temp, $form_id);
$form = call_user_func_array('drupal_retrieve_form', $args_temp);
- $form_build_id = 'form-'. md5(mt_rand());
+ $form_build_id = 'form-'. md5(uniqid(mt_rand(), true));
$form['#build_id'] = $form_build_id;
drupal_prepare_form($form_id, $form, $form_state);
// Store a copy of the unprocessed form for caching and indicate that it
@@ -216,28 +216,35 @@
}
/**
- * Fetch a form from cache.
- */
-function form_get_cache($form_build_id, &$form_state) {
- if ($cached = cache_get('form_'. $form_build_id, 'cache_form')) {
- $form = $cached->data;
- if ($cached = cache_get('storage_'. $form_build_id, 'cache_form')) {
- $form_state['storage'] = $cached->data;
- }
- return $form;
- }
-}
-
-/**
- * Store a form in the cache
+ * Store a form in the cache.
*/
function form_set_cache($form_build_id, $form, $form_state) {
+ global $user;
// 6 hours cache life time for forms should be plenty.
$expire = 21600;
+ if ($user->uid) {
+ $form['#cache_token'] = drupal_get_token();
+ }
cache_set('form_'. $form_build_id, $form, 'cache_form', time() + $expire);
if (!empty($form_state['storage'])) {
cache_set('storage_'. $form_build_id, $form_state['storage'], 'cache_form', time() + $expire);
+ }
+}
+
+/**
+ * Fetch a form from cache.
+ */
+function form_get_cache($form_build_id, &$form_state) {
+ global $user;
+ if ($cached = cache_get('form_'. $form_build_id, 'cache_form')) {
+ $form = $cached->data;
+ if ((isset($form['#cache_token']) && drupal_valid_token($form['#cache_token'])) || (!isset($form['#cache_token']) && !$user->uid)) {
+ if ($cached = cache_get('storage_'. $form_build_id, 'cache_form')) {
+ $form_state['storage'] = $cached->data;
+ }
+ return $form;
+ }
}
}
@@ -1517,6 +1524,7 @@
function theme_radio($element) {
_form_set_class($element, array('form-radio'));
$output = '<input type="radio" ';
+ $output .= 'id="'. $element['#id'] .'" ';
$output .= 'name="'. $element['#name'] .'" ';
$output .= 'value="'. $element['#return_value'] .'" ';
$output .= (check_plain($element['#value']) == $element['#return_value']) ? ' checked="checked" ' : ' ';
@@ -1733,6 +1741,7 @@
'#attributes' => $element['#attributes'],
'#parents' => $element['#parents'],
'#id' => form_clean_id('edit-'. implode('-', $parents_for_id)),
+ '#ahah' => isset($element['#ahah']) ? $element['#ahah'] : NULL,
);
}
}
Modified: branches/upstream/current-6/includes/session.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/includes/session.inc?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/includes/session.inc (original)
+++ branches/upstream/current-6/includes/session.inc Thu Aug 14 23:34:55 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: session.inc,v 1.44.2.1 2008/02/07 11:58:40 goba Exp $
+// $Id: session.inc,v 1.44.2.2 2008/08/12 10:29:03 dries Exp $
/**
* @file
@@ -107,15 +107,14 @@
}
/**
- * Counts how many users have sessions. Can count either anonymous sessions, authenticated sessions, or both.
+ * Counts how many users have sessions. Can count either anonymous sessions or authenticated sessions.
*
* @param int $timestamp
* A Unix timestamp representing a point of time in the past.
* The default is 0, which counts all existing sessions.
- * @param int $anonymous
+ * @param boolean $anonymous
* TRUE counts only anonymous users.
* FALSE counts only authenticated users.
- * Any other value will return the count of both authenticated and anonymous users.
* @return int
* The number of users with sessions.
*/
Modified: branches/upstream/current-6/install.php
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/install.php?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/install.php (original)
+++ branches/upstream/current-6/install.php Thu Aug 14 23:34:55 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: install.php,v 1.113.2.3 2008/07/09 19:15:59 goba Exp $
+// $Id: install.php,v 1.113.2.5 2008/07/18 07:17:44 dries Exp $
require_once './includes/install.inc';
@@ -448,23 +448,41 @@
/**
* Form API array definition for the profile selection form.
- */
-function install_select_profile_form(&$form_state, $profiles) {
- foreach ($profiles as $profile) {
+ *
+ * @param $form_state
+ * Array of metadata about state of form processing.
+ * @param $profile_files
+ * Array of .profile files, as returned from file_scan_directory().
+ */
+function install_select_profile_form(&$form_state, $profile_files) {
+ $profiles = array();
+ $names = array();
+
+ foreach ($profile_files as $profile) {
include_once($profile->filename);
- // Load profile details.
+
+ // Load profile details and store them for later retrieval.
$function = $profile->name .'_profile_details';
if (function_exists($function)) {
$details = $function();
}
- // If set, used defined name. Otherwise use file name.
+ $profiles[$profile->name] = $details;
+
+ // Determine the name of the profile; default to file name if defined name
+ // is unspecified.
$name = isset($details['name']) ? $details['name'] : $profile->name;
+ $names[$profile->name] = $name;
+ }
+
+ // Display radio buttons alphabetically by human-readable name.
+ natcasesort($names);
+ foreach ($names as $profile => $name) {
$form['profile'][$name] = array(
'#type' => 'radio',
'#value' => 'default',
- '#return_value' => $profile->name,
+ '#return_value' => $profile,
'#title' => $name,
- '#description' => isset($details['description']) ? $details['description'] : '',
+ '#description' => isset($profiles[$profile]['description']) ? $profiles[$profile]['description'] : '',
'#parents' => array('profile'),
);
}
@@ -880,7 +898,12 @@
}
}
if (!$exists) {
- drupal_set_message(st('The @drupal installer requires that you create %file as part of the installation process, and then make it writable. If you are unsure how to grant file permissions, please consult the <a href="@handbook_url">on-line handbook</a>.', array('@drupal' => drupal_install_profile_name(), '%file' => $file, '@handbook_url' => 'http://drupal.org/server-permissions')), 'error');
+ drupal_set_message(st('The @drupal installer requires that you create a settings file as part of the installation process.
+<ol>
+<li>Copy the %default_file file to %file.</li>
+<li>Change file permissions so that it is writable by the web server. If you are unsure how to grant file permissions, please consult the <a href="@handbook_url">on-line handbook</a>.</li>
+</ol>
+More details about installing Drupal are available in INSTALL.txt.', array('@drupal' => drupal_install_profile_name(), '%file' => $file, '%default_file' => $conf_path .'/default.settings.php', '@handbook_url' => 'http://drupal.org/server-permissions')), 'error');
}
elseif (!$writable) {
drupal_set_message(st('The @drupal installer requires write permissions to %file during the installation process. If you are unsure how to grant file permissions, please consult the <a href="@handbook_url">on-line handbook</a>.', array('@drupal' => drupal_install_profile_name(), '%file' => $file, '@handbook_url' => 'http://drupal.org/server-permissions')), 'error');
Modified: branches/upstream/current-6/modules/aggregator/aggregator.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/aggregator/aggregator.info?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/aggregator/aggregator.info (original)
+++ branches/upstream/current-6/modules/aggregator/aggregator.info Thu Aug 14 23:34:55 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-07-09
-version = "6.3"
+; Information added by drupal.org packaging script on 2008-08-14
+version = "6.4"
project = "drupal"
-datestamp = "1215640509"
+datestamp = "1218672610"
Modified: branches/upstream/current-6/modules/aggregator/aggregator.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/aggregator/aggregator.module?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/aggregator/aggregator.module (original)
+++ branches/upstream/current-6/modules/aggregator/aggregator.module Thu Aug 14 23:34:55 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: aggregator.module,v 1.374.2.2 2008/07/05 05:57:33 dries Exp $
+// $Id: aggregator.module,v 1.374.2.3 2008/08/08 20:10:01 dries Exp $
/**
* @file
@@ -381,6 +381,8 @@
}
else {
db_query('DELETE FROM {aggregator_category} WHERE cid = %d', $edit['cid']);
+ // Make sure there is no active block for this category.
+ db_query("DELETE FROM {blocks} WHERE module = '%s' AND delta = '%s'", 'aggregator', 'category-' . $edit['cid']);
$edit['title'] = '';
$op = 'delete';
}
@@ -421,6 +423,8 @@
}
db_query('DELETE FROM {aggregator_feed} WHERE fid = %d', $edit['fid']);
db_query('DELETE FROM {aggregator_item} WHERE fid = %d', $edit['fid']);
+ // Make sure there is no active block for this feed.
+ db_query("DELETE FROM {blocks} WHERE module = '%s' AND delta = '%s'", 'aggregator', 'feed-' . $edit['fid']);
}
else if (!empty($edit['title'])) {
db_query("INSERT INTO {aggregator_feed} (title, url, refresh, block, description, image) VALUES ('%s', '%s', %d, 5, '', '')", $edit['title'], $edit['url'], $edit['refresh']);
Modified: branches/upstream/current-6/modules/block/block.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/block/block.info?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/block/block.info (original)
+++ branches/upstream/current-6/modules/block/block.info Thu Aug 14 23:34:55 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-07-09
-version = "6.3"
+; Information added by drupal.org packaging script on 2008-08-14
+version = "6.4"
project = "drupal"
-datestamp = "1215640509"
+datestamp = "1218672610"
Modified: branches/upstream/current-6/modules/blog/blog.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/blog/blog.info?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/blog/blog.info (original)
+++ branches/upstream/current-6/modules/blog/blog.info Thu Aug 14 23:34:55 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-07-09
-version = "6.3"
+; Information added by drupal.org packaging script on 2008-08-14
+version = "6.4"
project = "drupal"
-datestamp = "1215640509"
+datestamp = "1218672610"
Modified: branches/upstream/current-6/modules/blogapi/blogapi.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/blogapi/blogapi.info?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/blogapi/blogapi.info (original)
+++ branches/upstream/current-6/modules/blogapi/blogapi.info Thu Aug 14 23:34:55 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-07-09
-version = "6.3"
+; Information added by drupal.org packaging script on 2008-08-14
+version = "6.4"
project = "drupal"
-datestamp = "1215640509"
+datestamp = "1218672610"
Modified: branches/upstream/current-6/modules/blogapi/blogapi.install
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/blogapi/blogapi.install?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/blogapi/blogapi.install (original)
+++ branches/upstream/current-6/modules/blogapi/blogapi.install Thu Aug 14 23:34:55 2008
@@ -1,5 +1,62 @@
<?php
-// $Id: blogapi.install,v 1.1 2008/01/09 09:51:34 goba Exp $
+// $Id: blogapi.install,v 1.1.2.1 2008/08/13 23:59:12 drumm Exp $
+
+/**
+ * Implementation of hook_install().
+ */
+function blogapi_install() {
+ // Create tables.
+ drupal_install_schema('blogapi');
+}
+
+/**
+ * Implementation of hook_uninstall().
+ */
+function blogapi_uninstall() {
+ // Remove tables.
+ drupal_uninstall_schema('blogapi');
+}
+
+
+/**
+ * Implementation of hook_schema().
+ */
+function blogapi_schema() {
+ //This table was introduced in Drupal 6.4
+ $schema['blogapi_files'] = array(
+ 'description' => t('Stores information for files uploaded via the blogapi.'),
+ 'fields' => array(
+ 'fid' => array(
+ 'description' => t('Primary Key: Unique file ID.'),
+ 'type' => 'serial',
+ ),
+ 'uid' => array(
+ 'description' => t('The {users}.uid of the user who is associated with the file.'),
+ 'type' => 'int',
+ 'unsigned' => TRUE,
+ 'not null' => TRUE,
+ 'default' => 0),
+ 'filepath' => array(
+ 'description' => t('Path of the file relative to Drupal root.'),
+ 'type' => 'varchar',
+ 'length' => 255,
+ 'not null' => TRUE,
+ 'default' => ''),
+ 'filesize' => array(
+ 'description' => t('The size of the file in bytes.'),
+ 'type' => 'int',
+ 'unsigned' => TRUE,
+ 'not null' => TRUE,
+ 'default' => 0),
+ ),
+ 'primary key' => array('fid'),
+ 'indexes' => array(
+ 'uid' => array('uid'),
+ ),
+ );
+
+ return $schema;
+}
/**
* @defgroup updates-5.x-to-6.x Blog API updates from 5.x to 6.x
@@ -14,7 +71,55 @@
return array();
}
+
+/**
+ * Add blogapi_files table to enable size restriction for BlogAPI file uploads.
+ *
+ * This table was introduced in Drupal 6.4.
+ */
+function blogapi_update_6001() {
+ $schema['blogapi_files'] = array(
+ 'description' => t('Stores information for files uploaded via the blogapi.'),
+ 'fields' => array(
+ 'fid' => array(
+ 'description' => t('Primary Key: Unique file ID.'),
+ 'type' => 'serial',
+ ),
+ 'uid' => array(
+ 'description' => t('The {users}.uid of the user who is associated with the file.'),
+ 'type' => 'int',
+ 'unsigned' => TRUE,
+ 'not null' => TRUE,
+ 'default' => 0),
+ 'filepath' => array(
+ 'description' => t('Path of the file relative to Drupal root.'),
+ 'type' => 'varchar',
+ 'length' => 255,
+ 'not null' => TRUE,
+ 'default' => ''),
+ 'filesize' => array(
+ 'description' => t('The size of the file in bytes.'),
+ 'type' => 'int',
+ 'unsigned' => TRUE,
+ 'not null' => TRUE,
+ 'default' => 0),
+ ),
+ 'primary key' => array('fid'),
+ 'indexes' => array(
+ 'uid' => array('uid'),
+ ),
+ );
+
+ $ret = array();
+
+ if (!db_table_exists('blogapi_files')) {
+ db_create_table($ret, 'blogapi_files', $schema['blogapi_files']);
+ }
+ return $ret;
+}
+
/**
* @} End of "defgroup updates-5.x-to-6.x"
* The next series of updates should start at 7000.
*/
+
Modified: branches/upstream/current-6/modules/blogapi/blogapi.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/blogapi/blogapi.module?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/blogapi/blogapi.module (original)
+++ branches/upstream/current-6/modules/blogapi/blogapi.module Thu Aug 14 23:34:55 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: blogapi.module,v 1.115.2.1 2008/02/07 20:11:02 goba Exp $
+// $Id: blogapi.module,v 1.115.2.3 2008/08/13 23:59:13 drumm Exp $
/**
* @file
@@ -129,7 +129,7 @@
t('Retrieve information about the text formatting plugins supported by the server.')),
array(
'mt.publishPost',
- 'blogap_mti_publish_post',
+ 'blogapi_mt_publish_post',
array('boolean', 'string', 'string', 'string'),
t('Publish (rebuild) all of the static files related to an entry from your blog. Equivalent to saving an entry in the system (but without the ping).')));
}
@@ -371,16 +371,63 @@
return blogapi_error($user);
}
+ $usersize = 0;
+ $uploadsize = 0;
+
+ $roles = array_intersect(user_roles(FALSE, 'administer content with blog api'), $user->roles);
+
+ foreach ($roles as $rid => $name) {
+ $extensions .= ' '. strtolower(variable_get("blogapi_extensions_$rid", variable_get('blogapi_extensions_default', 'jpg jpeg gif png txt doc xls pdf ppt pps odt ods odp')));
+ $usersize= max($usersize, variable_get("blogapi_usersize_$rid", variable_get('blogapi_usersize_default', 1)) * 1024 * 1024);
+ $uploadsize = max($uploadsize, variable_get("blogapi_uploadsize_$rid", variable_get('blogapi_uploadsize_default', 1)) * 1024 * 1024);
+ }
+
+ $filesize = strlen($file['bits']);
+
+ if ($filesize > $uploadsize) {
+ return blogapi_error(t('It is not possible to upload the file, because it exceeded the maximum filesize of @maxsize.', array('@maxsize' => format_size($uploadsize))));
+ }
+
+ if (_blogapi_space_used($user->uid) + $filesize > $usersize) {
+ return blogapi_error(t('The file can not be attached to this post, because the disk quota of @quota has been reached.', array('@quota' => format_size($usersize))));
+ }
+
+ // Only allow files with whitelisted extensions and convert remaining dots to
+ // underscores to prevent attacks via non-terminal executable extensions with
+ // files such as exploit.php.jpg.
+
+ $whitelist = array_unique(explode(' ', trim($extensions)));
+
$name = basename($file['name']);
+
+ if ($extension_position = strrpos($name, '.')) {
+ $filename = drupal_substr($name, 0, $extension_position);
+ $final_extension = drupal_substr($name, $extension_position + 1);
+
+ if (!in_array(strtolower($final_extension), $whitelist)) {
+ return blogapi_error(t('It is not possible to upload the file, because it is only possible to upload files with the following extensions: @extensions', array('@extensions' => implode(' ', $whitelist))));
+ }
+
+ $filename = str_replace('.', '_', $filename);
+ $filename .= '.'. $final_extension;
+ }
+
$data = $file['bits'];
if (!$data) {
return blogapi_error(t('No file sent.'));
}
- if (!$file = file_save_data($data, $name)) {
+ if (!$file = file_save_data($data, $filename)) {
return blogapi_error(t('Error storing file.'));
}
+
+ $row = new stdClass();
+ $row->uid = $user->uid;
+ $row->filepath = $file;
+ $row->filesize = $filesize;
+
+ drupal_write_record('blogapi_files', $row);
// Return the successful result.
return array('url' => file_create_url($file), 'struct');
@@ -487,7 +534,7 @@
/**
* Blogging API callback. Publishes the given node
*/
-function blogap_mti_publish_post($postid, $username, $password) {
+function blogapi_mt_publish_post($postid, $username, $password) {
$user = blogapi_validate_user($username, $password);
if (!$user->uid) {
return blogapi_error($user);
@@ -567,6 +614,81 @@
'#options' => $node_types,
'#description' => t('Select the content types available to external blogging clients via Blog API. If supported, each enabled content type will be displayed as a separate "blog" by the external client.')
);
+
+ $blogapi_extensions_default = variable_get('blogapi_extensions_default', 'jpg jpeg gif png txt doc xls pdf ppt pps odt ods odp');
+ $blogapi_uploadsize_default = variable_get('blogapi_uploadsize_default', 1);
+ $blogapi_usersize_default = variable_get('blogapi_usersize_default', 1);
+
+ $form['settings_general'] = array(
+ '#type' => 'fieldset',
+ '#title' => t('File settings'),
+ '#collapsible' => TRUE,
+ );
+
+ $form['settings_general']['blogapi_extensions_default'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Default permitted file extensions'),
+ '#default_value' => $blogapi_extensions_default,
+ '#maxlength' => 255,
+ '#description' => t('Default extensions that users can upload. Separate extensions with a space and do not include the leading dot.'),
+ );
+
+ $form['settings_general']['blogapi_uploadsize_default'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Default maximum file size per upload'),
+ '#default_value' => $blogapi_uploadsize_default,
+ '#size' => 5,
+ '#maxlength' => 5,
+ '#description' => t('The default maximum file size a user can upload.'),
+ '#field_suffix' => t('MB')
+ );
+
+ $form['settings_general']['blogapi_usersize_default'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Default total file size per user'),
+ '#default_value' => $blogapi_usersize_default,
+ '#size' => 5,
+ '#maxlength' => 5,
+ '#description' => t('The default maximum size of all files a user can have on the site.'),
+ '#field_suffix' => t('MB')
+ );
+
+ $form['settings_general']['upload_max_size'] = array('#value' => '<p>'. t('Your PHP settings limit the maximum file size per upload to %size.', array('%size' => format_size(file_upload_max_size()))).'</p>');
+
+ $roles = user_roles(0, 'administer content with blog api');
+ $form['roles'] = array('#type' => 'value', '#value' => $roles);
+
+ foreach ($roles as $rid => $role) {
+ $form['settings_role_'. $rid] = array(
+ '#type' => 'fieldset',
+ '#title' => t('Settings for @role', array('@role' => $role)),
+ '#collapsible' => TRUE,
+ '#collapsed' => TRUE,
+ );
+ $form['settings_role_'. $rid]['blogapi_extensions_'. $rid] = array(
+ '#type' => 'textfield',
+ '#title' => t('Permitted file extensions'),
+ '#default_value' => variable_get('blogapi_extensions_'. $rid, $blogapi_extensions_default),
+ '#maxlength' => 255,
+ '#description' => t('Extensions that users in this role can upload. Separate extensions with a space and do not include the leading dot.'),
+ );
+ $form['settings_role_'. $rid]['blogapi_uploadsize_'. $rid] = array(
+ '#type' => 'textfield',
+ '#title' => t('Maximum file size per upload'),
+ '#default_value' => variable_get('blogapi_uploadsize_'. $rid, $blogapi_uploadsize_default),
+ '#size' => 5,
+ '#maxlength' => 5,
+ '#description' => t('The maximum size of a file a user can upload (in megabytes).'),
+ );
+ $form['settings_role_'. $rid]['blogapi_usersize_'. $rid] = array(
+ '#type' => 'textfield',
+ '#title' => t('Total file size per user'),
+ '#default_value' => variable_get('blogapi_usersize_'. $rid, $blogapi_usersize_default),
+ '#size' => 5,
+ '#maxlength' => 5,
+ '#description' => t('The maximum size of all files a user can have on the site (in megabytes).'),
+ );
+ }
return system_settings_form($form);
}
@@ -726,3 +848,7 @@
return $types;
}
+
+function _blogapi_space_used($uid) {
+ return db_result(db_query('SELECT SUM(filesize) FROM {blogapi_files} f WHERE f.uid = %d', $uid));
+}
Modified: branches/upstream/current-6/modules/book/book.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/book/book.info?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/book/book.info (original)
+++ branches/upstream/current-6/modules/book/book.info Thu Aug 14 23:34:55 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-07-09
-version = "6.3"
+; Information added by drupal.org packaging script on 2008-08-14
+version = "6.4"
project = "drupal"
-datestamp = "1215640509"
+datestamp = "1218672610"
Modified: branches/upstream/current-6/modules/book/book.pages.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/book/book.pages.inc?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/book/book.pages.inc (original)
+++ branches/upstream/current-6/modules/book/book.pages.inc Thu Aug 14 23:34:55 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: book.pages.inc,v 1.5 2007/12/22 23:24:24 goba Exp $
+// $Id: book.pages.inc,v 1.5.2.1 2008/08/13 23:59:13 drumm Exp $
/**
* @file
@@ -231,11 +231,8 @@
* Prints the replacement HTML in JSON format.
*/
function book_form_update() {
- $cid = 'form_'. $_POST['form_build_id'];
$bid = $_POST['book']['bid'];
- $cache = cache_get($cid, 'cache_form');
- if ($cache) {
- $form = $cache->data;
+ if ($form = form_get_cache($_POST['form_build_id'], $form_state)) {
// Validate the bid.
if (isset($form['book']['bid']['#options'][$bid])) {
@@ -243,7 +240,7 @@
$book_link['bid'] = $bid;
// Get the new options and update the cache.
$form['book']['plid'] = _book_parent_select($book_link);
- cache_set($cid, $form, 'cache_form', $cache->expire);
+ form_set_cache($_POST['form_build_id'], $form, $form_state);
// Build and render the new select element, then return it in JSON format.
$form_state = array();
Modified: branches/upstream/current-6/modules/color/color.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/color/color.info?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/color/color.info (original)
+++ branches/upstream/current-6/modules/color/color.info Thu Aug 14 23:34:55 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-07-09
-version = "6.3"
+; Information added by drupal.org packaging script on 2008-08-14
+version = "6.4"
project = "drupal"
-datestamp = "1215640509"
+datestamp = "1218672610"
Modified: branches/upstream/current-6/modules/comment/comment.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/comment/comment.info?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/comment/comment.info (original)
+++ branches/upstream/current-6/modules/comment/comment.info Thu Aug 14 23:34:55 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-07-09
-version = "6.3"
+; Information added by drupal.org packaging script on 2008-08-14
+version = "6.4"
project = "drupal"
-datestamp = "1215640509"
+datestamp = "1218672610"
Modified: branches/upstream/current-6/modules/contact/contact.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/contact/contact.info?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/contact/contact.info (original)
+++ branches/upstream/current-6/modules/contact/contact.info Thu Aug 14 23:34:55 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-07-09
-version = "6.3"
+; Information added by drupal.org packaging script on 2008-08-14
+version = "6.4"
project = "drupal"
-datestamp = "1215640509"
+datestamp = "1218672610"
Modified: branches/upstream/current-6/modules/dblog/dblog.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/dblog/dblog.info?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/dblog/dblog.info (original)
+++ branches/upstream/current-6/modules/dblog/dblog.info Thu Aug 14 23:34:55 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-07-09
-version = "6.3"
+; Information added by drupal.org packaging script on 2008-08-14
+version = "6.4"
project = "drupal"
-datestamp = "1215640509"
+datestamp = "1218672610"
Modified: branches/upstream/current-6/modules/filter/filter.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/filter/filter.info?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/filter/filter.info (original)
+++ branches/upstream/current-6/modules/filter/filter.info Thu Aug 14 23:34:55 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-07-09
-version = "6.3"
+; Information added by drupal.org packaging script on 2008-08-14
+version = "6.4"
project = "drupal"
-datestamp = "1215640509"
+datestamp = "1218672610"
Modified: branches/upstream/current-6/modules/filter/filter.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/filter/filter.module?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/filter/filter.module (original)
+++ branches/upstream/current-6/modules/filter/filter.module Thu Aug 14 23:34:55 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: filter.module,v 1.204.2.2 2008/07/09 21:48:28 goba Exp $
+// $Id: filter.module,v 1.204.2.4 2008/08/13 23:59:13 drumm Exp $
/**
* @file
@@ -671,7 +671,7 @@
'#title' => t('Allowed HTML tags'),
'#default_value' => variable_get("allowed_html_$format", '<a> <em> <strong> <cite> <code> <ul> <ol> <li> <dl> <dt> <dd>'),
'#size' => 64,
- '#maxlength' => 255,
+ '#maxlength' => 1024,
'#description' => t('If "Strip disallowed tags" is selected, optionally specify tags which should not be stripped. JavaScript event attributes are always stripped.'),
);
$form['filter_html']["filter_html_help_$format"] = array(
@@ -983,7 +983,7 @@
(
<(?=[^a-zA-Z!/]) # a lone <
| # or
- <[^>]*.(>|$) # a string that starts with a <, up until the > or the end of the string
+ <[^>]*(>|$) # a string that starts with a <, up until the > or the end of the string
| # or
> # just a >
)%x', '_filter_xss_split', $string);
Modified: branches/upstream/current-6/modules/forum/forum.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/forum/forum.info?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/forum/forum.info (original)
+++ branches/upstream/current-6/modules/forum/forum.info Thu Aug 14 23:34:55 2008
@@ -7,8 +7,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-07-09
-version = "6.3"
+; Information added by drupal.org packaging script on 2008-08-14
+version = "6.4"
project = "drupal"
-datestamp = "1215640509"
+datestamp = "1218672610"
Modified: branches/upstream/current-6/modules/help/help.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/help/help.info?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/help/help.info (original)
+++ branches/upstream/current-6/modules/help/help.info Thu Aug 14 23:34:55 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-07-09
-version = "6.3"
+; Information added by drupal.org packaging script on 2008-08-14
+version = "6.4"
project = "drupal"
-datestamp = "1215640509"
+datestamp = "1218672610"
Modified: branches/upstream/current-6/modules/locale/locale.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/locale/locale.info?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/locale/locale.info (original)
+++ branches/upstream/current-6/modules/locale/locale.info Thu Aug 14 23:34:55 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-07-09
-version = "6.3"
+; Information added by drupal.org packaging script on 2008-08-14
+version = "6.4"
project = "drupal"
-datestamp = "1215640509"
+datestamp = "1218672610"
Modified: branches/upstream/current-6/modules/menu/menu.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/menu/menu.info?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/menu/menu.info (original)
+++ branches/upstream/current-6/modules/menu/menu.info Thu Aug 14 23:34:55 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-07-09
-version = "6.3"
+; Information added by drupal.org packaging script on 2008-08-14
+version = "6.4"
project = "drupal"
-datestamp = "1215640509"
+datestamp = "1218672610"
Modified: branches/upstream/current-6/modules/node/node.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/node/node.info?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/node/node.info (original)
+++ branches/upstream/current-6/modules/node/node.info Thu Aug 14 23:34:55 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-07-09
-version = "6.3"
+; Information added by drupal.org packaging script on 2008-08-14
+version = "6.4"
project = "drupal"
-datestamp = "1215640509"
+datestamp = "1218672610"
Modified: branches/upstream/current-6/modules/openid/openid.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/openid/openid.info?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/openid/openid.info (original)
+++ branches/upstream/current-6/modules/openid/openid.info Thu Aug 14 23:34:55 2008
@@ -5,8 +5,8 @@
package = Core - optional
core = 6.x
-; Information added by drupal.org packaging script on 2008-07-09
-version = "6.3"
+; Information added by drupal.org packaging script on 2008-08-14
+version = "6.4"
project = "drupal"
-datestamp = "1215640509"
+datestamp = "1218672610"
Modified: branches/upstream/current-6/modules/path/path.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/path/path.info?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/path/path.info (original)
+++ branches/upstream/current-6/modules/path/path.info Thu Aug 14 23:34:55 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-07-09
-version = "6.3"
+; Information added by drupal.org packaging script on 2008-08-14
+version = "6.4"
project = "drupal"
-datestamp = "1215640509"
+datestamp = "1218672610"
Modified: branches/upstream/current-6/modules/php/php.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/php/php.info?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/php/php.info (original)
+++ branches/upstream/current-6/modules/php/php.info Thu Aug 14 23:34:55 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-07-09
-version = "6.3"
+; Information added by drupal.org packaging script on 2008-08-14
+version = "6.4"
project = "drupal"
-datestamp = "1215640509"
+datestamp = "1218672610"
Modified: branches/upstream/current-6/modules/ping/ping.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/ping/ping.info?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/ping/ping.info (original)
+++ branches/upstream/current-6/modules/ping/ping.info Thu Aug 14 23:34:55 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-07-09
-version = "6.3"
+; Information added by drupal.org packaging script on 2008-08-14
+version = "6.4"
project = "drupal"
-datestamp = "1215640509"
+datestamp = "1218672610"
Modified: branches/upstream/current-6/modules/poll/poll.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/poll/poll.info?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/poll/poll.info (original)
+++ branches/upstream/current-6/modules/poll/poll.info Thu Aug 14 23:34:55 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-07-09
-version = "6.3"
+; Information added by drupal.org packaging script on 2008-08-14
+version = "6.4"
project = "drupal"
-datestamp = "1215640509"
+datestamp = "1218672610"
Modified: branches/upstream/current-6/modules/poll/poll.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/poll/poll.module?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/poll/poll.module (original)
+++ branches/upstream/current-6/modules/poll/poll.module Thu Aug 14 23:34:55 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: poll.module,v 1.263.2.1 2008/04/25 20:39:55 goba Exp $
+// $Id: poll.module,v 1.263.2.2 2008/08/13 23:59:13 drumm Exp $
/**
* @file
@@ -338,7 +338,9 @@
// Add the new element to the stored form. Without adding the element to the
// form, Drupal is not aware of this new elements existence and will not
// process it. We retreive the cached form, add the element, and resave.
- $form = form_get_cache($form_build_id, $form_state);
+ if (!$form = form_get_cache($form_build_id, $form_state)) {
+ exit();
+ }
$form['choice_wrapper']['choice'][$delta] = $form_element;
form_set_cache($form_build_id, $form, $form_state);
$form += array(
Modified: branches/upstream/current-6/modules/profile/profile.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/profile/profile.info?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/profile/profile.info (original)
+++ branches/upstream/current-6/modules/profile/profile.info Thu Aug 14 23:34:55 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-07-09
-version = "6.3"
+; Information added by drupal.org packaging script on 2008-08-14
+version = "6.4"
project = "drupal"
-datestamp = "1215640509"
+datestamp = "1218672610"
Modified: branches/upstream/current-6/modules/search/search.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/search/search.info?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/search/search.info (original)
+++ branches/upstream/current-6/modules/search/search.info Thu Aug 14 23:34:55 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-07-09
-version = "6.3"
+; Information added by drupal.org packaging script on 2008-08-14
+version = "6.4"
project = "drupal"
-datestamp = "1215640509"
+datestamp = "1218672610"
Modified: branches/upstream/current-6/modules/search/search.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/search/search.module?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/search/search.module (original)
+++ branches/upstream/current-6/modules/search/search.module Thu Aug 14 23:34:55 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: search.module,v 1.250.2.2 2008/04/09 21:11:49 goba Exp $
+// $Id: search.module,v 1.250.2.3 2008/08/13 06:59:49 dries Exp $
/**
* @file
@@ -911,7 +911,7 @@
*
* @ingroup search
*/
-function do_search($keywords, $type, $join1 = '', $where1 = '1', $arguments1 = array(), $columns2 = 'i.relevance AS score', $join2 = '', $arguments2 = array(), $sort_parameters = 'ORDER BY score DESC') {
+function do_search($keywords, $type, $join1 = '', $where1 = '1 = 1', $arguments1 = array(), $columns2 = 'i.relevance AS score', $join2 = '', $arguments2 = array(), $sort_parameters = 'ORDER BY score DESC') {
$query = search_parse_query($keywords);
if ($query[2] == '') {
Modified: branches/upstream/current-6/modules/statistics/statistics.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/statistics/statistics.info?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/statistics/statistics.info (original)
+++ branches/upstream/current-6/modules/statistics/statistics.info Thu Aug 14 23:34:55 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-07-09
-version = "6.3"
+; Information added by drupal.org packaging script on 2008-08-14
+version = "6.4"
project = "drupal"
-datestamp = "1215640509"
+datestamp = "1218672610"
Modified: branches/upstream/current-6/modules/syslog/syslog.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/syslog/syslog.info?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/syslog/syslog.info (original)
+++ branches/upstream/current-6/modules/syslog/syslog.info Thu Aug 14 23:34:55 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-07-09
-version = "6.3"
+; Information added by drupal.org packaging script on 2008-08-14
+version = "6.4"
project = "drupal"
-datestamp = "1215640509"
+datestamp = "1218672610"
Modified: branches/upstream/current-6/modules/syslog/syslog.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/syslog/syslog.module?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/syslog/syslog.module (original)
+++ branches/upstream/current-6/modules/syslog/syslog.module Thu Aug 14 23:34:55 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: syslog.module,v 1.14.2.1 2008/04/09 21:11:49 goba Exp $
+// $Id: syslog.module,v 1.14.2.2 2008/07/24 06:52:43 dries Exp $
/**
* @file
@@ -44,9 +44,7 @@
'#default_value' => variable_get('syslog_facility', DEFAULT_SYSLOG_FACILITY),
'#options' => syslog_facility_list(),
'#description' => t('Select the syslog facility code under which Drupal\'s messages should be sent. On UNIX/Linux systems, Drupal can flag its messages with the code LOG_LOCAL0 through LOG_LOCAL7; for Microsoft Windows, all messages are flagged with the code LOG_USER. Depending on the system configuration, syslog and other logging tools use this code to identify or filter Drupal messages from within the entire system log. For more information on syslog, see <a href="@syslog_help">Syslog help</a>.', array(
- '@syslog_help' => url('admin/help/syslog'),
- '!php' => l("PHP's syslog", 'http://www.php.net/manual/en/function.openlog.php', array('external' => TRUE)),
- '!syslog_conf' => l('UNIX/Linux syslog.conf', 'http://www.rt.com/man/syslog.5.html', array('external' => TRUE)))),
+ '@syslog_help' => url('admin/help/syslog'))),
);
return system_settings_form($form);
}
Modified: branches/upstream/current-6/modules/system/system.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/system/system.info?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/system/system.info (original)
+++ branches/upstream/current-6/modules/system/system.info Thu Aug 14 23:34:55 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-07-09
-version = "6.3"
+; Information added by drupal.org packaging script on 2008-08-14
+version = "6.4"
project = "drupal"
-datestamp = "1215640509"
+datestamp = "1218672610"
Modified: branches/upstream/current-6/modules/system/system.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/system/system.module?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/system/system.module (original)
+++ branches/upstream/current-6/modules/system/system.module Thu Aug 14 23:34:55 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: system.module,v 1.585.2.13 2008/07/09 21:48:28 goba Exp $
+// $Id: system.module,v 1.585.2.16 2008/08/13 23:59:13 drumm Exp $
/**
* @file
@@ -9,7 +9,7 @@
/**
* The current system version.
*/
-define('VERSION', '6.3');
+define('VERSION', '6.4');
/**
* Core API compatibility.
@@ -842,7 +842,7 @@
function _system_theme_data() {
static $themes_info = array();
- if (empty($theme_info)) {
+ if (empty($themes_info)) {
// Find themes
$themes = drupal_system_listing('\.info$', 'themes');
// Find theme engines
Modified: branches/upstream/current-6/modules/taxonomy/taxonomy.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/taxonomy/taxonomy.info?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/taxonomy/taxonomy.info (original)
+++ branches/upstream/current-6/modules/taxonomy/taxonomy.info Thu Aug 14 23:34:55 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-07-09
-version = "6.3"
+; Information added by drupal.org packaging script on 2008-08-14
+version = "6.4"
project = "drupal"
-datestamp = "1215640509"
+datestamp = "1218672610"
Modified: branches/upstream/current-6/modules/throttle/throttle.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/throttle/throttle.info?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/throttle/throttle.info (original)
+++ branches/upstream/current-6/modules/throttle/throttle.info Thu Aug 14 23:34:55 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-07-09
-version = "6.3"
+; Information added by drupal.org packaging script on 2008-08-14
+version = "6.4"
project = "drupal"
-datestamp = "1215640509"
+datestamp = "1218672610"
Modified: branches/upstream/current-6/modules/tracker/tracker.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/tracker/tracker.info?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/tracker/tracker.info (original)
+++ branches/upstream/current-6/modules/tracker/tracker.info Thu Aug 14 23:34:55 2008
@@ -6,8 +6,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-07-09
-version = "6.3"
+; Information added by drupal.org packaging script on 2008-08-14
+version = "6.4"
project = "drupal"
-datestamp = "1215640509"
+datestamp = "1218672610"
Modified: branches/upstream/current-6/modules/translation/translation.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/translation/translation.info?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/translation/translation.info (original)
+++ branches/upstream/current-6/modules/translation/translation.info Thu Aug 14 23:34:55 2008
@@ -6,8 +6,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-07-09
-version = "6.3"
+; Information added by drupal.org packaging script on 2008-08-14
+version = "6.4"
project = "drupal"
-datestamp = "1215640509"
+datestamp = "1218672610"
Modified: branches/upstream/current-6/modules/trigger/trigger.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/trigger/trigger.info?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/trigger/trigger.info (original)
+++ branches/upstream/current-6/modules/trigger/trigger.info Thu Aug 14 23:34:55 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-07-09
-version = "6.3"
+; Information added by drupal.org packaging script on 2008-08-14
+version = "6.4"
project = "drupal"
-datestamp = "1215640509"
+datestamp = "1218672610"
Modified: branches/upstream/current-6/modules/update/update.compare.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/update/update.compare.inc?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/update/update.compare.inc (original)
+++ branches/upstream/current-6/modules/update/update.compare.inc Thu Aug 14 23:34:55 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: update.compare.inc,v 1.8 2008/02/03 19:34:02 goba Exp $
+// $Id: update.compare.inc,v 1.8.2.1 2008/08/12 05:10:12 dries Exp $
/**
* @file
@@ -160,7 +160,6 @@
$projects[$key]['existing_version'] = $info['version'];
$projects[$key]['existing_major'] = $info['major'];
$projects[$key]['install_type'] = $install_type;
- unset($projects[$key]['info']);
}
}
Modified: branches/upstream/current-6/modules/update/update.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/update/update.info?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/update/update.info (original)
+++ branches/upstream/current-6/modules/update/update.info Thu Aug 14 23:34:55 2008
@@ -5,8 +5,8 @@
package = Core - optional
core = 6.x
-; Information added by drupal.org packaging script on 2008-07-09
-version = "6.3"
+; Information added by drupal.org packaging script on 2008-08-14
+version = "6.4"
project = "drupal"
-datestamp = "1215640509"
+datestamp = "1218672610"
Modified: branches/upstream/current-6/modules/upload/upload.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/upload/upload.info?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/upload/upload.info (original)
+++ branches/upstream/current-6/modules/upload/upload.info Thu Aug 14 23:34:55 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-07-09
-version = "6.3"
+; Information added by drupal.org packaging script on 2008-08-14
+version = "6.4"
project = "drupal"
-datestamp = "1215640509"
+datestamp = "1218672610"
Modified: branches/upstream/current-6/modules/upload/upload.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/upload/upload.module?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/upload/upload.module (original)
+++ branches/upstream/current-6/modules/upload/upload.module Thu Aug 14 23:34:55 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: upload.module,v 1.197.2.1 2008/02/11 15:08:09 goba Exp $
+// $Id: upload.module,v 1.197.2.2 2008/08/13 23:59:14 drumm Exp $
/**
* @file
@@ -144,17 +144,19 @@
/**
* Implementation of hook_file_download().
*/
-function upload_file_download($file) {
- if (!user_access('view uploaded files')) {
- return -1;
- }
- $file = file_create_path($file);
- $result = db_query("SELECT f.* FROM {files} f INNER JOIN {upload} u ON f.fid = u.fid WHERE filepath = '%s'", $file);
+function upload_file_download($filepath) {
+ $filepath = file_create_path($filepath);
+ $result = db_query("SELECT f.*, u.nid FROM {files} f INNER JOIN {upload} u ON f.fid = u.fid WHERE filepath = '%s'", $filepath);
if ($file = db_fetch_object($result)) {
- return array(
- 'Content-Type: '. $file->filemime,
- 'Content-Length: '. $file->filesize,
- );
+ if (user_access('view uploaded files') && ($node = node_load($file->nid)) && node_access('view', $node)) {
+ return array(
+ 'Content-Type: ' . $file->filemime,
+ 'Content-Length: ' . $file->filesize,
+ );
+ }
+ else {
+ return -1;
+ }
}
}
@@ -165,7 +167,7 @@
* @param $node
* A node object to associate with uploaded files.
*/
-function upload_node_form_submit($form, &$form_state) {
+function upload_node_form_submit(&$form, &$form_state) {
global $user;
$limits = _upload_file_limits($user);
@@ -180,15 +182,14 @@
$file->list = variable_get('upload_list_default', 1);
$file->description = $file->filename;
$file->weight = 0;
- $_SESSION['upload_files'][$file->fid] = $file;
- }
-
- // Attach session files to node.
- if (!empty($_SESSION['upload_files'])) {
- foreach ($_SESSION['upload_files'] as $fid => $file) {
- if (!isset($form_state['values']['files'][$fid]['filepath'])) {
- $form_state['values']['files'][$fid] = (array)$file;
- }
+ $file->new = TRUE;
+ $form['#node']->files[$file->fid] = $file;
+ $form_state['values']['files'][$file->fid] = (array)$file;
+ }
+
+ if (isset($form_state['values']['files'])) {
+ foreach ($form_state['values']['files'] as $fid => $file) {
+ $form_state['values']['files'][$fid]['new'] = !empty($form['#node']->files[$fid]->new);
}
}
@@ -286,16 +287,6 @@
);
}
}
- }
- break;
-
- case 'prepare':
- // Initialize $_SESSION['upload_files'] if no post occurred.
- // This clears the variable from old forms and makes sure it
- // is an array to prevent notices and errors in other parts
- // of upload.module.
- if (!$_POST) {
- $_SESSION['upload_files'] = array();
}
break;
@@ -410,13 +401,13 @@
// Remove it from the session in the case of new uploads,
// that you want to disassociate before node submission.
- unset($_SESSION['upload_files'][$fid]);
+ unset($node->files[$fid]);
// Move on, so the removed file won't be added to new revisions.
continue;
}
// Create a new revision, or associate a new file needed.
- if (!empty($node->old_vid) || isset($_SESSION['upload_files'][$fid])) {
+ if (!empty($node->old_vid) || $file->new) {
db_query("INSERT INTO {upload} (fid, nid, vid, list, description, weight) VALUES (%d, %d, %d, %d, '%s', %d)", $file->fid, $node->nid, $node->vid, $file->list, $file->description, $file->weight);
file_set_status($file, FILE_STATUS_PERMANENT);
}
@@ -426,9 +417,6 @@
file_set_status($file, FILE_STATUS_PERMANENT);
}
}
- // Empty the session storage after save. We use this variable to track files
- // that haven't been related to the node yet.
- unset($_SESSION['upload_files']);
}
function upload_delete($node) {
@@ -491,6 +479,7 @@
$form['files'][$key]['filemime'] = array('#type' => 'value', '#value' => $file->filemime);
$form['files'][$key]['filesize'] = array('#type' => 'value', '#value' => $file->filesize);
$form['files'][$key]['fid'] = array('#type' => 'value', '#value' => $file->fid);
+ $form['files'][$key]['new'] = array('#type' => 'value', '#value' => FALSE);
}
}
@@ -516,8 +505,6 @@
);
}
- // This value is used in upload_js().
- $form['current']['vid'] = array('#type' => 'hidden', '#value' => isset($node->vid) ? $node->vid : 0);
return $form;
}
@@ -576,44 +563,51 @@
* Menu-callback for JavaScript-based uploads.
*/
function upload_js() {
+ $cached_form_state = array();
+ $files = array();
+
// Load the form from the Form API cache.
- $cache = cache_get('form_'. $_POST['form_build_id'], 'cache_form');
-
- // We only do the upload.module part of the node validation process.
- $node = (object)$_POST;
- unset($node->files['upload']);
- $form = $cache->data;
+ if (!($cached_form = form_get_cache($_POST['form_build_id'], $cached_form_state)) || !isset($cached_form['#node']) || !isset($cached_form['attachments'])) {
+ form_set_error('form_token', t('Validation error, please try again. If this error persists, please contact the site administrator.'));
+ $output = theme('status_messages');
+ print drupal_to_js(array('status' => TRUE, 'data' => $output));
+ exit();
+ }
+
$form_state = array('values' => $_POST);
// Handle new uploads, and merge tmp files into node-files.
- upload_node_form_submit($form, $form_state);
- $node_files = upload_load($node);
- if (!empty($form_state['values']['files'])) {
+ upload_node_form_submit($cached_form, $form_state);
+
+ if(!empty($form_state['values']['files'])) {
foreach ($form_state['values']['files'] as $fid => $file) {
- if (is_numeric($fid)) {
- $node->files[$fid] = $file;
- if (!isset($file['filepath'])) {
- $node->files[$fid] = $node_files[$fid];
- }
- }
- }
- }
+ if (isset($cached_form['#node']->files[$fid])) {
+ $files[$fid] = $cached_form['#node']->files[$fid];
+ }
+ }
+ }
+
+ $node = $cached_form['#node'];
+
+ $node->files = $files;
+
$form = _upload_form($node);
- // Update the default values changed in the $_POST array.
- $files = isset($_POST['files']) ? $_POST['files'] : array();
+ unset($cached_form['attachments']['wrapper']['new']);
+ $cached_form['attachments']['wrapper'] = array_merge($cached_form['attachments']['wrapper'], $form);
+
+ $cached_form['attachments']['#collapsed'] = FALSE;
+
+ form_set_cache($_POST['form_build_id'], $cached_form, $cached_form_state);
+
foreach ($files as $fid => $file) {
if (is_numeric($fid)) {
- $form['files'][$fid]['description']['#default_value'] = $file['description'];
- $form['files'][$fid]['list']['#default_value'] = isset($file['list']) ? 1 : 0;
- $form['files'][$fid]['remove']['#default_value'] = isset($file['remove']) ? 1 : 0;
- $form['files'][$fid]['weight']['#default_value'] = $file['weight'];
- }
- }
-
- // Add the new element to the stored form state and resave.
- $cache->data['attachments']['wrapper'] = array_merge($cache->data['attachments']['wrapper'], $form);
- cache_set('form_'. $_POST['form_build_id'], $cache->data, 'cache_form', $cache->expire);
+ $form['files'][$fid]['description']['#default_value'] = $form_state['values']['files'][$fid]['description'];
+ $form['files'][$fid]['list']['#default_value'] = !empty($form_state['values']['files'][$fid]['list']);
+ $form['files'][$fid]['remove']['#default_value'] = !empty($form_state['values']['files'][$fid]['remove']);
+ $form['files'][$fid]['weight']['#default_value'] = $form_state['values']['files'][$fid]['weight'];
+ }
+ }
// Render the form for output.
$form += array(
Modified: branches/upstream/current-6/modules/user/user.admin.inc
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/user/user.admin.inc?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/user/user.admin.inc (original)
+++ branches/upstream/current-6/modules/user/user.admin.inc Thu Aug 14 23:34:55 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: user.admin.inc,v 1.18 2008/01/16 22:54:41 goba Exp $
+// $Id: user.admin.inc,v 1.18.2.1 2008/08/13 23:59:14 drumm Exp $
/**
* @file
@@ -707,44 +707,21 @@
}
/**
- * Menu callback: add an access rule
+ * Menu callback: add an access rule.
*/
function user_admin_access_add($mask = NULL, $type = NULL) {
- if ($edit = $_POST) {
- if (!$edit['mask']) {
- form_set_error('mask', t('You must enter a mask.'));
- }
- else {
- db_query("INSERT INTO {access} (mask, type, status) VALUES ('%s', '%s', %d)", $edit['mask'], $edit['type'], $edit['status']);
- $aid = db_last_insert_id('access', 'aid');
- drupal_set_message(t('The access rule has been added.'));
- drupal_goto('admin/user/rules');
- }
- }
- else {
- $edit['mask'] = $mask;
- $edit['type'] = $type;
- }
+ $edit = array();
+ $edit['aid'] = 0;
+ $edit['mask'] = $mask;
+ $edit['type'] = $type;
return drupal_get_form('user_admin_access_add_form', $edit, t('Add rule'));
}
/**
- * Menu callback: edit an access rule
+ * Menu callback: edit an access rule.
*/
function user_admin_access_edit($aid = 0) {
- if ($edit = $_POST) {
- if (!$edit['mask']) {
- form_set_error('mask', t('You must enter a mask.'));
- }
- else {
- db_query("UPDATE {access} SET mask = '%s', type = '%s', status = '%s' WHERE aid = %d", $edit['mask'], $edit['type'], $edit['status'], $aid);
- drupal_set_message(t('The access rule has been saved.'));
- drupal_goto('admin/user/rules');
- }
- }
- else {
- $edit = db_fetch_array(db_query('SELECT aid, type, status, mask FROM {access} WHERE aid = %d', $aid));
- }
+ $edit = db_fetch_array(db_query('SELECT aid, type, status, mask FROM {access} WHERE aid = %d', $aid));
return drupal_get_form('user_admin_access_edit_form', $edit, t('Save rule'));
}
@@ -754,6 +731,11 @@
* @ingroup forms
*/
function user_admin_access_form(&$form_state, $edit, $submit) {
+ $form = array();
+ $form['aid'] = array(
+ '#type' => 'value',
+ '#value' => $edit['aid'],
+ );
$form['status'] = array(
'#type' => 'radios',
'#title' => t('Access type'),
@@ -777,8 +759,25 @@
'#required' => TRUE,
);
$form['submit'] = array('#type' => 'submit', '#value' => $submit);
+ $form['#submit'] = array('user_admin_access_form_submit');
return $form;
+}
+
+/**
+ * Submit callback for user_admin_access_form().
+ */
+function user_admin_access_form_submit($form, &$form_state) {
+ $edit = $form_state['values'];
+ if ($edit['aid']) {
+ db_query("UPDATE {access} SET mask = '%s', type = '%s', status = '%s' WHERE aid = %d", $edit['mask'], $edit['type'], $edit['status'], $edit['aid']);
+ drupal_set_message(t('The access rule has been saved.'));
+ }
+ else {
+ db_query("INSERT INTO {access} (mask, type, status) VALUES ('%s', '%s', %d)", $edit['mask'], $edit['type'], $edit['status']);
+ drupal_set_message(t('The access rule has been added.'));
+ }
+ $form_state['redirect'] = 'admin/user/rules';
}
function user_admin_access_check_validate($form, &$form_state) {
Modified: branches/upstream/current-6/modules/user/user.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/user/user.info?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/user/user.info (original)
+++ branches/upstream/current-6/modules/user/user.info Thu Aug 14 23:34:55 2008
@@ -5,8 +5,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-07-09
-version = "6.3"
+; Information added by drupal.org packaging script on 2008-08-14
+version = "6.4"
project = "drupal"
-datestamp = "1215640509"
+datestamp = "1218672610"
Modified: branches/upstream/current-6/modules/user/user.module
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/modules/user/user.module?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/modules/user/user.module (original)
+++ branches/upstream/current-6/modules/user/user.module Thu Aug 14 23:34:55 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: user.module,v 1.892.2.5 2008/07/09 21:48:28 goba Exp $
+// $Id: user.module,v 1.892.2.6 2008/08/12 05:11:22 dries Exp $
/**
* @file
@@ -1387,8 +1387,11 @@
function user_external_login_register($name, $module) {
global $user;
- $user = user_load(array('name' => $name));
- if (!isset($user->uid)) {
+ $existing_user = user_load(array('name' => $name));
+ if (isset($existing_user->uid)) {
+ $user = $existing_user;
+ }
+ else {
// Register this new user.
$userinfo = array(
'name' => $name,
Modified: branches/upstream/current-6/sites/default/default.settings.php
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/sites/default/default.settings.php?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/sites/default/default.settings.php (original)
+++ branches/upstream/current-6/sites/default/default.settings.php Thu Aug 14 23:34:55 2008
@@ -1,5 +1,5 @@
<?php
-// $Id: default.settings.php,v 1.8 2007/12/20 09:35:10 goba Exp $
+// $Id: default.settings.php,v 1.8.2.1 2008/08/13 06:52:36 dries Exp $
/**
* @file
@@ -82,7 +82,6 @@
* 'sessions' => 'shared_',
* 'role' => 'shared_',
* 'authmap' => 'shared_',
- * 'sequences' => 'shared_',
* );
*
* Database URL format:
Modified: branches/upstream/current-6/themes/bluemarine/bluemarine.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/themes/bluemarine/bluemarine.info?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/themes/bluemarine/bluemarine.info (original)
+++ branches/upstream/current-6/themes/bluemarine/bluemarine.info Thu Aug 14 23:34:55 2008
@@ -5,8 +5,8 @@
core = 6.x
engine = phptemplate
-; Information added by drupal.org packaging script on 2008-07-09
-version = "6.3"
+; Information added by drupal.org packaging script on 2008-08-14
+version = "6.4"
project = "drupal"
-datestamp = "1215640509"
+datestamp = "1218672610"
Modified: branches/upstream/current-6/themes/chameleon/chameleon.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/themes/chameleon/chameleon.info?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/themes/chameleon/chameleon.info (original)
+++ branches/upstream/current-6/themes/chameleon/chameleon.info Thu Aug 14 23:34:55 2008
@@ -12,8 +12,8 @@
version = VERSION
core = 6.x
-; Information added by drupal.org packaging script on 2008-07-09
-version = "6.3"
+; Information added by drupal.org packaging script on 2008-08-14
+version = "6.4"
project = "drupal"
-datestamp = "1215640509"
+datestamp = "1218672610"
Modified: branches/upstream/current-6/themes/chameleon/marvin/marvin.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/themes/chameleon/marvin/marvin.info?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/themes/chameleon/marvin/marvin.info (original)
+++ branches/upstream/current-6/themes/chameleon/marvin/marvin.info Thu Aug 14 23:34:55 2008
@@ -7,8 +7,8 @@
core = 6.x
base theme = chameleon
-; Information added by drupal.org packaging script on 2008-07-09
-version = "6.3"
+; Information added by drupal.org packaging script on 2008-08-14
+version = "6.4"
project = "drupal"
-datestamp = "1215640509"
+datestamp = "1218672610"
Modified: branches/upstream/current-6/themes/garland/garland.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/themes/garland/garland.info?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/themes/garland/garland.info (original)
+++ branches/upstream/current-6/themes/garland/garland.info Thu Aug 14 23:34:55 2008
@@ -7,8 +7,8 @@
stylesheets[all][] = style.css
stylesheets[print][] = print.css
-; Information added by drupal.org packaging script on 2008-07-09
-version = "6.3"
+; Information added by drupal.org packaging script on 2008-08-14
+version = "6.4"
project = "drupal"
-datestamp = "1215640509"
+datestamp = "1218672610"
Modified: branches/upstream/current-6/themes/garland/minnelli/minnelli.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/themes/garland/minnelli/minnelli.info?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/themes/garland/minnelli/minnelli.info (original)
+++ branches/upstream/current-6/themes/garland/minnelli/minnelli.info Thu Aug 14 23:34:55 2008
@@ -6,8 +6,8 @@
base theme = garland
stylesheets[all][] = minnelli.css
-; Information added by drupal.org packaging script on 2008-07-09
-version = "6.3"
+; Information added by drupal.org packaging script on 2008-08-14
+version = "6.4"
project = "drupal"
-datestamp = "1215640509"
+datestamp = "1218672610"
Modified: branches/upstream/current-6/themes/pushbutton/pushbutton.info
URL: http://svn.debian.org/wsvn/pkg-drupal/branches/upstream/current-6/themes/pushbutton/pushbutton.info?rev=1919&op=diff
==============================================================================
--- branches/upstream/current-6/themes/pushbutton/pushbutton.info (original)
+++ branches/upstream/current-6/themes/pushbutton/pushbutton.info Thu Aug 14 23:34:55 2008
@@ -5,8 +5,8 @@
core = 6.x
engine = phptemplate
-; Information added by drupal.org packaging script on 2008-07-09
-version = "6.3"
+; Information added by drupal.org packaging script on 2008-08-14
+version = "6.4"
project = "drupal"
-datestamp = "1215640509"
+datestamp = "1218672610"
More information about the Pkg-drupal-commits
mailing list