Commit Graph

176 Commits

Author SHA1 Message Date
Evan Prodromou
bfa053ef17 Remove executable bits from Auth_SASL files 2011-02-09 11:04:52 -05:00
Evan Prodromou
9c4294fb50 include Auth_SASL from PEAR in extlib 2011-02-09 11:03:44 -05:00
Brion Vibber
baae319aef extlibs updates: PEAR::Mail to 1.2.0, PEAR::Net_SMTP to 1.4.2 (need to go together as a pair)
PEAR::Mail updated to 1.2.0 from 1.1.4, fixes deprecation warnings on PHP 5.3, as well as:
1.2.0:
• QA release - stable.
• Updated minimum dependencies (Net_SMTP, PEAR, PHP)
• Doc Bug #15620 Licence change to BSD
• Bug #13659 Mail parse error in special condition
• Bug #16200 - Security hole allow to read/write Arbitrary File
_hasUnclosedQuotes() doesn't properly handle a double slash before an end quote (slusarz@curecanti.org, Bug #9137).
• Make sure Net_SMTP is defined when calling getSMTPObject() directly (slusarz@curecanti.org, Bug #13772).
• Add addServiceExtensionParameter() to the SMTP driver (slusarz@curecanti.org, Bug #13764).
• Add a method to obtain the Net_SMTP object from the SMTP driver (slusarz@curecanti.org, Bug #13766).

PEAR::Net_SMTP updated to 1.4.2 from 1.3.1, needed to support updated PEAR::Mail:
1.4.2:
• Fixing header string quoting in data(). (Bug #17199)
1.4.1:
• The auth() method now includes an optional $tls parameter that determines whether or not TLS should be attempted (if supported by the PHP runtime and the remote SMTP server). This parameter defaults to true. (Bug #16349)
• Header data can be specified separately from message body data by passing it as the optional second parameter to ``data()``. This is especially useful when an open file resource is being used to supply message data because it allows header fields (like *Subject:*) to be built dynamically at runtime. (Request #17012)
1.4.0:
• The data() method now accepts either a string or a file resource containing the message data. (Request #16962)
1.3.4:
• All Net_Socket write failures are now recognized. (Bug #16831)
1.3.3:
• Added getGreeting(), for retrieving the server's greeting string. (Request #16066) [needed for PEAR::Mail]
• We no longer attempt a TLS connection if we're already using a secure socket. (Bug #16254)
• You can now specify a debug output handler via setDebug(). (Request #16420)
1.3.2:
• TLS connection only gets started if no AUTH methods are sent. (Bug #14944)
2010-12-10 10:47:22 -08:00
Brion Vibber
9df856e667 Merge branch '0.9.x' into merge
Conflicts:
	README
	actions/hostmeta.php
	classes/File_redirection.php
	lib/common.php
	lib/designsettings.php
	lib/router.php
	lib/util.php
	lib/xmppmanager.php
	plugins/OStatus/OStatusPlugin.php
2010-12-07 10:50:05 -08:00
Evan Prodromou
6a0fd59df2 Net URL Mapper Path plex file 2010-11-27 16:52:32 -05:00
Evan Prodromou
0a753206cb Net_URL_Mapper 0.9.1 2010-11-27 16:48:52 -05:00
Brion Vibber
ed2bc323a1 Drop PEAR HTTP_Request library -- no longer used since Services_oEmbed was dropped.
(HTTP_Request2 is separate and is widely used. Net_URL is also used separately by Net_URL_Mapper.)
2010-11-19 12:15:28 -08:00
Brion Vibber
e317ec11ad Drop PEAR Services_oEmbed -- ended up replaced by our oEmbedHelper wrapper. The extra validation available there is problematic, and their code for building HTML for us wasn't being used anyway. 2010-11-15 12:35:15 -08:00
Craig Andrews
0721d8d3e2 Merge remote branch 'statusnet/0.9.x' into 1.0.x 2010-10-14 15:27:17 -04:00
Zach Copley
a54991797d Upgrade OAuth.php to the latest version. 2010-10-06 13:39:58 -07:00
Evan Prodromou
9f0715a993 Merge branch '0.9.x' into 1.0.x 2010-08-03 16:05:03 -07:00
Brion Vibber
f0620a74c8 Provisional OAuth, OpenID token check timing attack patches 2010-07-19 16:47:49 -07:00
Brion Vibber
c5e89527d9 Updated OMB_Yadis_XRDS for compatibility with php-openid 2.2.2: Auth_Yadis_XRDS::parseXRDS() is now declared static, and PHP 5.3 demands it say so on the subclass too.
Compat fix branch for upstream: 6589dc073f
2010-06-29 15:03:50 -04:00
Brion Vibber
15b1d130d2 Update to last upstream version of libomb: coding style updates, static call fix, improved handling of invalid XRD URIs. 2010-06-29 14:39:57 -04:00
Brion Vibber
2d920e05d5 Update the (formerly) Janrain OpenID library to 2.2.2 -- bug fixes including PHP 5.3 compatibility fix.
Upstream release was tagged at: a287b2d85e
2010-06-29 10:24:48 -04:00
Brion Vibber
ddc7811a7b Move XMPPHP from core extlibs to Xmpp plugin extlibs 2010-05-05 16:52:31 -07:00
Brion Vibber
081ee9b29c extlibs updates: PEAR::Mail to 1.2.0, PEAR::Net_SMTP to 1.4.2 (need to go together as a pair)
PEAR::Mail updated to 1.2.0 from 1.1.4, fixes deprecation warnings on PHP 5.3, as well as:
1.2.0:
• QA release - stable.
• Updated minimum dependencies (Net_SMTP, PEAR, PHP)
• Doc Bug #15620 Licence change to BSD
• Bug #13659 Mail parse error in special condition
• Bug #16200 - Security hole allow to read/write Arbitrary File
_hasUnclosedQuotes() doesn't properly handle a double slash before an end quote (slusarz@curecanti.org, Bug #9137).
• Make sure Net_SMTP is defined when calling getSMTPObject() directly (slusarz@curecanti.org, Bug #13772).
• Add addServiceExtensionParameter() to the SMTP driver (slusarz@curecanti.org, Bug #13764).
• Add a method to obtain the Net_SMTP object from the SMTP driver (slusarz@curecanti.org, Bug #13766).

PEAR::Net_SMTP updated to 1.4.2 from 1.3.1, needed to support updated PEAR::Mail:
1.4.2:
• Fixing header string quoting in data(). (Bug #17199)
1.4.1:
• The auth() method now includes an optional $tls parameter that determines whether or not TLS should be attempted (if supported by the PHP runtime and the remote SMTP server). This parameter defaults to true. (Bug #16349)
• Header data can be specified separately from message body data by passing it as the optional second parameter to ``data()``. This is especially useful when an open file resource is being used to supply message data because it allows header fields (like *Subject:*) to be built dynamically at runtime. (Request #17012)
1.4.0:
• The data() method now accepts either a string or a file resource containing the message data. (Request #16962)
1.3.4:
• All Net_Socket write failures are now recognized. (Bug #16831)
1.3.3:
• Added getGreeting(), for retrieving the server's greeting string. (Request #16066) [needed for PEAR::Mail]
• We no longer attempt a TLS connection if we're already using a secure socket. (Bug #16254)
• You can now specify a debug output handler via setDebug(). (Request #16420)
1.3.2:
• TLS connection only gets started if no AUTH methods are sent. (Bug #14944)
2010-05-03 16:49:59 -07:00
Brion Vibber
f514f7b722 Merge branch 'testing' into 0.9.x 2010-05-03 12:25:29 -07:00
Brion Vibber
df4462611c Revert "Update PEAR::Mail to 1.2.0 release; fixes deprecation warnings running under PHP 5.3."
This reverts commit 9fd02a4f11.

Looks like there's some changes I missed in there and getting this in'll involve updating some other packages. Will poke it after 0.9.2.
2010-05-01 09:51:25 -07:00
Brion Vibber
f85fc944b7 Merge branch 'testing' into 0.9.x 2010-04-30 14:07:24 -07:00
Brion Vibber
9fd02a4f11 Update PEAR::Mail to 1.2.0 release; fixes deprecation warnings running under PHP 5.3. 2010-04-30 13:47:46 -07:00
Brion Vibber
a39efbd8d8 Update XMPPHP to last upstream release (r77), includes an XML quoting fix. 2010-04-30 13:37:40 -07:00
Brion Vibber
df9eb4164a Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-03-31 12:48:24 -07:00
Brion Vibber
0841fa712e Ticket #1281: JID validation now more or less follows spec instead of calling e-mail validator
Basic splitting/validation code submitted via http://status.net/wiki/XMPP/JID_validation -- Copyright 2009 Patrick Georgi <patrick@georgi-clan.de> Licensed under ISC-L, which is compatible with everything else that keeps the copyright notice intact.

Added PEAR Net_IDNA package to extlib to handle IDN normalization (also used by Validate's email verifier if present).

* added test suite, supplemented my own test cases with JID validation and normalization test cases from libpurple
* follows XMPP rules for validation of name part
* fixes for normalization with non-ASCII names
* will do domain checks if $config['email']['check_domain'] is on, checking for an XMPP-server SRV record or any lookup. (We don't actually need to ping those direct though.)
* some more obscure stringprep validation rules aren't quite followed yet, but we err on the side of permissiveness.
* we still don't actually let you save your address with a resource on it, as we strip resources when looking up users who've sent us presence or message updates. I would recommend saving the outgoing resource as a separate field if/when we add that..?
2010-03-30 17:35:27 -07:00
Craig Andrews
1f73156dae Move the bundled Net/LDAP2 library to the LdapCommon directory 2010-03-23 21:57:47 -04:00
Brion Vibber
e18e659ca3 Drop HTMLPurifier; we don't need its extra capabilities and we're already using htmLawed which is lighter-weight. 2010-02-24 23:39:40 +00:00
Evan Prodromou
81ea0f8117 Add HTMLPurifier to extlib
HTMLPurifier defangs arbitrary submitted HTML. We're using it in the
OStatus plugin, but it may be valuable for other parts of the codebase
(I think OEmbed might benefit, for example).
2010-02-20 11:35:01 -05:00
Brion Vibber
8869ccc94e Temporary debug hack tracking down 'revoked accesstoken' issue with OMB posts 2010-02-15 15:19:16 -08:00
Evan Prodromou
7679f058ef Revert "DEBUG HACK: error checking for xml_parse in XMPPHP input stream"
This reverts commit 906450e2f5.

1) It was a quick debug hack 2) it doesn't meet the requirements
for changing extlib/ libraries
2010-01-20 15:56:24 -05:00
Brion Vibber
906450e2f5 DEBUG HACK: error checking for xml_parse in XMPPHP input stream 2010-01-20 08:37:58 -08:00
Evan Prodromou
8679bc6c7b add LGPL 2010-01-02 22:46:50 -10:00
Evan Prodromou
dfba47bdf4 include DB_DataObject 1.9.0 2009-12-08 15:32:50 -05:00
Brion Vibber
8ab40e7051 Cleanup for bug 1813: workaround sometimes-missing dl() in PHP 5.3 by defining our own bogus function rather than attempting to patch upstream libs. This keeps our fix across upstream versions (or when loading upstream library from outside extlib)
Note that fixes to OpenID libraries in commit fe9473ac78 were lost in just such an update.
2009-11-16 15:45:15 -08:00
Craig Andrews
5b51eeeebb Bump to version 1.0.0 2009-11-16 11:14:00 -05:00
Zach Copley
40bf174c01 Revert a OS X-specific change to PEAR MIME_Type that I accidentally commited. 2009-11-05 05:59:46 +00:00
Zach Copley
527427d3e0 Implement update avatar via API (/api/account/update_profile_image.format) 2009-11-04 21:00:26 -08:00
Craig Andrews
c403f7fa44 Added Net_LDAP2 to extlib, and add a skeleton LDAP plugin 2009-11-04 13:39:56 -05:00
Brion Vibber
5581143bee Rebuilt HTTPClient class as an extension of PEAR HTTP_Request2 package, adding redirect handling and convenience functions.
Caching support will be added in future work after unit tests have been added.

* extlib: add PEAR HTTP_Request2 0.4.1 alpha
* extlib: update PEAR Net_URL2 to 0.3.0 beta for HTTP_Request2 compatibility
* moved direct usage of CURL and file_get_contents to HTTPClient class, excluding external-sourced libraries
* adapted GeonamesPlugin for new HTTPResponse interface

Note some plugins haven't been fully tested yet.
2009-11-02 09:14:15 -08:00
Brion Vibber
b22fc5b74a Revert "Rebuilt HTTPClient class as an extension of PEAR HTTP_Request2 package, adding redirect handling and convenience functions."
Going to restructure a little more before finalizing this...

This reverts commit fa37967858.
2009-11-02 07:51:29 -08:00
Brion Vibber
fa37967858 Rebuilt HTTPClient class as an extension of PEAR HTTP_Request2 package, adding redirect handling and convenience functions.
Caching support will be added in future work after unit tests have been added.

* extlib: add PEAR HTTP_Request2 0.4.1 alpha
* extlib: update PEAR Net_URL2 to 0.3.0 beta for HTTP_Request2 compatibility
* moved direct usage of CURL and file_get_contents to HTTPClient class, excluding external-sourced libraries

Note some plugins haven't been tested yet.
2009-11-02 06:31:28 -08:00
Evan Prodromou
44ce8e2fcd Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-10-31 14:47:21 -04:00
Evan Prodromou
4e9ec0d0e1 merge from testing 2009-10-31 14:36:04 -04:00
Evan Prodromou
ae7d524fd8 add a README warning devs from fracking around in extlib/ 2009-10-31 13:35:20 -04:00
Craig Andrews
02131db1c9 Bump to Auth_OpenID 2.1.3 2009-10-30 01:30:42 -04:00
Zach Copley
d07c9d8750 Gather all the Facebook stuff together in one place 2009-10-21 01:07:03 +00:00
Evan Prodromou
035d4cf86e Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-10-19 15:36:26 -04:00
Brion Vibber
39598582d9 Merge branch 'i18n-work' into i18n-0.9.x 2009-10-19 09:25:05 -07:00
Brion Vibber
21e17e3738 Fix a logic error in php-gettext's setlocale() check; if setlocale() failed to return, we fall back to checking LANG environment variable. Now actually works when doing a setlocale *check* instead of a *set*.
Submitting fix upstream, but as the package is currently unmaintained it may not make it in.
2009-10-16 11:19:52 -07:00
Evan Prodromou
c1c8daa021 Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x 2009-10-15 04:49:59 -04:00
Evan Prodromou
2e3cda4da6 update DB_DataObject to 1.8.12 2009-10-15 04:49:45 -04:00
Brion Vibber
ffeef6520c Commit upstream updates to php-gettext after the 1.0.7 release (but in 2006! :P)
Fixes file magic checks on 64-bit systems.

http://bazaar.launchpad.net/~danilo/php-gettext/trunk/revision/17
http://bazaar.launchpad.net/~danilo/php-gettext/trunk/revision/18
http://bazaar.launchpad.net/~danilo/php-gettext/trunk/revision/19
2009-10-13 14:54:48 -07:00
Brion Vibber
77afd6c344 Commit upstream updates to php-gettext after the 1.0.7 release (but in 2006! :P)
Fixes file magic checks on 64-bit systems.

http://bazaar.launchpad.net/~danilo/php-gettext/trunk/revision/17
http://bazaar.launchpad.net/~danilo/php-gettext/trunk/revision/18
http://bazaar.launchpad.net/~danilo/php-gettext/trunk/revision/19
2009-10-13 14:51:23 -07:00
Evan Prodromou
8284b3cb82 Merge branch '0.8.x' into 0.9.x
Conflicts:
	actions/requesttoken.php
	classes/File.php
	install.php
	lib/noticeform.php
2009-09-23 09:45:22 -04:00
Evan Prodromou
48565a2cdc Revert "Several fixes to make RabbitMQ a player."
This reverts commit c04987018c.
2009-09-15 17:08:27 -04:00
Brion Vibber
fe9473ac78 Check that 'dl' function is available and usable before trying to call it with error suppression; if it's disabled or unavailable we end up with mysterious failures during installation or loading of libraries.
Fixed for StatusNet installer as well as some external libraries that should be fixed upstream if they haven't already been:
* PEAR
* Auth/OpenID
* Auth/Yadis
2009-09-13 21:53:30 -04:00
Marcel van der Boom
c04987018c Several fixes to make RabbitMQ a player.
* extlib/Stomp.php
    -spaces for tabs (we're on PEAR, right?)
    - send: initialize the $properties parameter as array() instead of null
      this prevents unsetting $headers if $properties was not set
      (besides that, it's the proper way to initialize an array)
    - subscribe: insert FIXME's on ActiveMQ specifics
    - ack: make sure the content-length header is set *and* is zero.
      I have seen the header set to '3' there but could not find where it
      came from, this is at least safe.
    - disconnect: typo in $headers variable
    - readFrame: use fgets() instead of gets() so that RabbitQ, which is more protocol strict can also play
  * extlib/Stomp/Frame.php
    - spaces for tabs
    - add note on possibly protocol violating linefeed
  * extlib/Stomp/Message.php
    - space for tabs
    - add content-length header for message
  * lib/stompqueuemanager.php
    - use the notice for logging, not the frame
2009-09-11 20:50:53 -04:00
Marcel van der Boom
a73162d3eb Silence the NOTICE log messages on port not defined, we deal with
that properly, and most of the time it is indeed not define
2009-09-11 20:49:24 -04:00
Craig Andrews
d7ae0ed4fd Merge remote branch 'laconica/0.8.x' into 0.9.x
Conflicts:
	lib/omb.php
2009-09-09 22:52:38 -04:00
Craig Andrews
5974871b7b Improve OAuth CGI compatibility
Fixes http://status.net/trac/ticket/1822
Reported upstream at http://code.google.com/p/oauth/issues/detail?id=118
2009-09-03 18:35:46 -04:00
Craig Andrews
a535ccdc4e Merge remote branch 'laconica/0.8.x' into 0.9.x
Conflicts:
	lib/common.php
	lib/twitter.php
2009-09-02 16:42:15 -04:00
Craig Andrews
29d0dd740c Allow whitespace before and after the = and require space before the href in <link href="url"> html 2009-09-01 23:18:39 -04:00
Craig Andrews
00032e1112 Allow the oEmbed <link> tag to be split across lines 2009-08-31 22:16:49 -04:00
Craig Andrews
3fd0a9693d Fix typo in Stomp
Thanks Marcel|HSD
2009-08-31 15:49:11 -04:00
Evan Prodromou
f1fda6c050 Merge branch '0.8.x' into 0.9.x 2009-08-27 07:56:19 -07:00
Brion Vibber
8246977ef0 kill stupid Finder metadata file that made it into my checkin presumably due to 'git add php-gettext' deciding to find all hidden files in the directory for me :P 2009-08-21 16:02:07 -04:00
Brion Vibber
8bca90b8d2 Tweak to php-gettext stream reader; initialize local variable before appending data to it to avoid triggering an E_NOTICE message. 2009-08-21 16:01:59 -04:00
Brion Vibber
5c21a371d6 Include php-gettext 1.0.7 into extlibs; loading it up if native gettext extension is not present.
This provides a pure PHP implementation of the gettext functions.

This should help get laconica running on shared hosting environments where PHP's gettext module may not be installed.
Also gets us one step closer to running on Mac OS X 10.5 with Apple's preinstalled PHP, which doesn't provide an easy way to add modules.

Source: http://savannah.nongnu.org/projects/php-gettext
Copyright (c) 2005 Steven Armstrong <sa at c-area dot ch>
GPLv2 or later
2009-08-21 16:01:51 -04:00
Adrian Lang
70235d7f05 Update libomb, fix some omb handling stuff, improve error handling. 2009-08-21 12:13:24 +02:00
Adrian Lang
ec88d2650e Replace own OMB stack with libomb. 2009-08-10 14:48:50 +02:00
Craig Andrews
ac75772150 Sanitize html returned by oEmbed providers to protect laconica from XSS attacks 2009-07-27 13:42:03 -04:00
Craig Andrews
3dbbefd5ad Merge branch 'oembed-provider' into 0.8.x 2009-07-17 12:33:56 -04:00
Evan Prodromou
3c2006eb13 Merge branch '0.8.x' of git@gitorious.org:laconica/mainline into 0.8.x 2009-07-16 00:27:23 -04:00
Evan Prodromou
77faf7610b upgrade to latest version of DB_DataObject 2009-07-15 23:35:20 -04:00
Zach Copley
5d94a7c69c Update to lastest external Facebook libs 2009-07-15 16:09:07 -07:00
Craig Andrews
f75932601c Fixed bugs in oEmbed library's discovery routines 2009-07-15 17:09:11 -04:00
Evan Prodromou
7ed94b23a2 added Mail/mimeDecode as mime-decode fallback 2009-06-30 16:11:46 -04:00
Evan Prodromou
ffa40a84ba update to latest (r76) version of XMPPHP 2009-06-28 21:03:21 -04:00
Evan Prodromou
ccd9cdd618 Add System_Command so MIME type fallback works for uploaded files 2009-06-23 05:16:23 -07:00
Evan Prodromou
18ba41e0a4 Revert "Revert "Add Console_Getopt""
This reverts commit 9fbb29111b.
2009-06-22 16:18:41 -07:00
Evan Prodromou
9fbb29111b Revert "Add Console_Getopt"
This reverts commit 79dcf0871f.
2009-06-22 16:04:50 -07:00
Evan Prodromou
79dcf0871f Add Console_Getopt 2009-06-22 14:55:55 -07:00
Robin Millette
3e0c291810 Added configurable options for attachments: supported mimetypes and quotas for uploads. 2009-05-31 16:42:29 -04:00
Zach Copley
6a2d22ddd8 Updated Facebook client libs to the latest version 2009-05-15 19:20:19 +00:00
Zach Copley
5771f413bb Fil's Patch to DB_DataObject to make it reconnect to the DB if
there's no connection. This patch has been added upstream and will
be in the next release, but I need it now for the bidirectional
bridge to work.
2009-05-07 02:08:49 -07:00
Evan Prodromou
6be15dfcac Merge branch '0.8.x' of git://gitorious.org/laconica/fmarani-clone into fmarani/0.8.x 2009-04-02 06:23:50 -04:00
Sarven Capadisli
27b45eeb48 Merge branch '0.7.x' into 0.8.x 2009-03-30 15:15:40 +00:00
Federico Marani
4b3f022fc2 Merge branch '0.8.x' of git://gitorious.org/laconica/dev into 0.8.x
Conflicts:

	lib/jabber.php
2009-03-28 13:52:01 +00:00
CiaranG
2c8f67f6a9 A different search pagination fix (see ticket #1333) that doesn't require fixing the upstream code, thus undoing the change made in d64be5108d 2009-03-25 15:39:58 +00:00
Evan Prodromou
8c073a34ce Merge branch '0.7.x' into 0.8.x 2009-03-23 15:55:07 -04:00
CiaranG
d64be5108d Fix to Net_URL_Mapper to make search pagination work. See Ticket #1333 2009-03-21 14:24:19 +00:00
Federico Marani
420c361304 Merge branch '0.8.x' of git://gitorious.org/laconica/dev into 0.8.x 2009-03-16 22:43:51 +00:00
Evan Prodromou
b3a0eea3b6 Merge branch '0.7.x' into 0.8.x
Conflicts:

	classes/Notice.php
	lib/action.php
	lib/router.php
	lib/twitter.php
2009-03-12 11:56:23 -04:00
Evan Prodromou
93030ae7b6 add missing PEAR_Exception file 2009-03-12 00:02:25 -04:00
Federico Marani
bab3e1b858 Merge branch '0.8.x' of git://gitorious.org/laconica/dev into 0.8.x
Conflicts:

	lib/util.php
2009-03-07 13:54:54 +00:00
Evan Prodromou
e8f36b4f6a Upstream changes to OAuth.php 2009-03-06 16:27:00 -08:00
Evan Prodromou
399669b1fb Upstream changes to OAuth.php 2009-03-06 16:26:28 -08:00
Evan Prodromou
34a61b40f4 Merge branch '0.7.x' into 0.8.x 2009-02-26 13:22:51 -08:00
Federico Marani
2ac684f53d * implemented STOMP support for external message queueing systems
* (ticket-724)
* included PHP STOMP libraries (http://code.google.com/p/stompcli/)
2009-02-20 18:57:20 +00:00
Evan Prodromou
b45ea01dab Required Net URL needed for Net URL Mapper 2009-02-10 16:19:45 -05:00
Evan Prodromou
e21f2cf29e Move Mapper to correct spot in the hierarchy 2009-02-10 15:55:37 -05:00