summaryrefslogtreecommitdiff
path: root/actions/imsettings.php
AgeCommit message (Collapse)Author
2010-04-30IM cleanup on 1.0.x branch:Brion Vibber
* Fake_XMPP back to Queued_XMPP, refactor how we use it and don't create objects and load classes until we need them. * fix fatal error in IM settings while waiting for a Jabber confirmation. * Caching fix for user_im_prefs * fix for saving multiple transport settings * some fixes for AIM & using normalized addresses for lookups
2010-04-18Merge branch '0.9.x' into 1.0.xCraig Andrews
Conflicts: actions/confirmaddress.php actions/imsettings.php
2010-04-11Fix a typo and small error in translator documentationSiebrand Mazeland
2010-04-11Add translator documentation.Siebrand Mazeland
Fixed a few inconsistencies in the process. Apparently this code has been copied to imsettings.php, and some cases of 'email' had not been changed to 'IM'. Added FIXME for using globals/macros (?) in messages like "%%site.name%%". For easier/more consistent translation, this should preferably be plain %s parameters.
2010-03-30Ticket #1281: JID validation now more or less follows spec instead of ↵Brion Vibber
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-01-27Create IM plugin, Pluginize XMPP, Create AIM pluginCraig Andrews
2010-01-22XMPP queued output & initial retooling of DB queue manager to support ↵Brion Vibber
non-Notice objects. Queue handlers for XMPP individual & firehose output now send their XML stanzas to another output queue instead of connecting directly to the chat server. This lets us have as many general processing threads as we need, while all actual XMPP input and output go through a single daemon with a single connection open. This avoids problems with multiple connected resources: * multiple windows shown in some chat clients (psi, gajim, kopete) * extra load on server * incoming message delivery forwarding issues Database changes: * queue_item drops 'notice_id' in favor of a 'frame' blob. This is based on Craig Andrews' work branch to generalize queues to take any object, but conservatively leaving out the serialization for now. Table updater (preserves any existing queued items) in db/rc3to09.sql Code changes to watch out for: * Queue handlers should now define a handle() method instead of handle_notice() * QueueDaemon and XmppDaemon now share common i/o (IoMaster) and respawning thread management (RespawningDaemon) infrastructure. * The polling XmppConfirmManager has been dropped, as the message is queued directly when saving IM settings. * Enable $config['queue']['debug_memory'] to output current memory usage at each run through the event loop to watch for memory leaks To do: * Adapt XMPP i/o to component connection mode for multi-site support. * XMPP input can also be broken out to a queue, which would allow the actual notice save etc to be handled by general queue threads. * Make sure there are no problems with simply pushing serialized Notice objects to queues. * Find a way to improve interactive performance of the database-backed queue handler; polling is pretty painful to XMPP. * Possibly redo the way QueueHandlers are injected into a QueueManager. The grouping used to split out the XMPP output queue is a bit awkward. Conflicts: scripts/xmppdaemon.php
2010-01-21XMPP queued output & initial retooling of DB queue manager to support ↵Brion Vibber
non-Notice objects. Queue handlers for XMPP individual & firehose output now send their XML stanzas to another output queue instead of connecting directly to the chat server. This lets us have as many general processing threads as we need, while all actual XMPP input and output go through a single daemon with a single connection open. This avoids problems with multiple connected resources: * multiple windows shown in some chat clients (psi, gajim, kopete) * extra load on server * incoming message delivery forwarding issues Database changes: * queue_item drops 'notice_id' in favor of a 'frame' blob. This is based on Craig Andrews' work branch to generalize queues to take any object, but conservatively leaving out the serialization for now. Table updater (preserves any existing queued items) in db/rc3to09.sql Code changes to watch out for: * Queue handlers should now define a handle() method instead of handle_notice() * QueueDaemon and XmppDaemon now share common i/o (IoMaster) and respawning thread management (RespawningDaemon) infrastructure. * The polling XmppConfirmManager has been dropped, as the message is queued directly when saving IM settings. * Enable $config['queue']['debug_memory'] to output current memory usage at each run through the event loop to watch for memory leaks To do: * Adapt XMPP i/o to component connection mode for multi-site support. * XMPP input can also be broken out to a queue, which would allow the actual notice save etc to be handled by general queue threads. * Make sure there are no problems with simply pushing serialized Notice objects to queues. * Find a way to improve interactive performance of the database-backed queue handler; polling is pretty painful to XMPP. * Possibly redo the way QueueHandlers are injected into a QueueManager. The grouping used to split out the XMPP output queue is a bit awkward.
2010-01-10Lots of tiny message changes.Siebrand Mazeland
* Mostly punctuation updates so that the same message is used consistently in all of StatusNet. * Some cases of "Title Case" removed, because that does not appear to be used consistently.
2009-08-26define LACONICA and accept LACONICA for backwards compatibilityEvan Prodromou
2009-08-25change LACONICA to STATUSNETEvan Prodromou
2009-08-25change controlyourself.ca to status.netEvan Prodromou
2009-08-25change laconi.ca to status.netEvan Prodromou
2009-08-25change Laconica and Control Yourself to StatusNet in PHP filesEvan Prodromou
2009-08-07Added configuration options to enable/disable SMS and Twitter integration.Jeffery To
This disables the IM, SMS and Twitter settings pages and queue handlers depending on the config options.
2009-01-19Renamed form_datas to form_datasarven
2009-01-18IM settings markup and style.sarven
Added confirmed/unconfirmed styles
2009-01-17Break up settings into two tabsetEvan Prodromou
Made two tabsets: account and connect. Removed "Invite" from the global nav to make room.
2009-01-16Update IM settings to new systemEvan Prodromou
2009-01-15Convert use of common_server_error and common_user_error to methods on ActionEvan Prodromou
2009-01-15Convert all actions to use new UI functionsEvan Prodromou
I did a massive search-and-replace to get all the action subclasses to use the new output function (common_element() -> $this->element(), etc.) There's still a lot to do, but it's a first step
2008-12-23move opening brace of class declaration to next lineEvan Prodromou
Another gigantor PEAR coding standards patch. Here, I've moved the opening curly bracket on a class statement to the following line. darcs-hash:20081223194923-84dde-77a93de314caadbcb5b70bf346a4648be77a864e.gz
2008-12-23TRUEEvan Prodromou
More PEAR coding standards global changes. Here, I've changed all instances of TRUE to true and FALSE to false. darcs-hash:20081223194428-84dde-cb1a1e6f679acd68e864545c4d4dd8752d6a6257.gz
2008-12-23change function headers to K&R styleEvan Prodromou
Another huge change, for PEAR code standards compliance. Function headers have to be in K&R style (opening brace on its own line), instead of having the opening brace on the same line as the function and parameters. So, a little perl magic found all the function definitions and move the opening brace to the next line (properly indented... usually). darcs-hash:20081223193323-84dde-a28e36ecc66672c783c2842d12fc11043c13ab28.gz
2008-12-23replace NULL with nullEvan Prodromou
Another global search-and-replace update. Here, I've replaced the PHP keyword 'NULL' with its lowercase version. This is another PEAR code standards change. darcs-hash:20081223192129-84dde-4a0182e0ec16a01ad88745ad3e08f7cb501aee0b.gz
2008-12-23replace all tabs with four spacesEvan Prodromou
The PEAR coding standards decree: no tabs, but indent by four spaces. I've done a global search-and-replace on all tabs, replacing them by four spaces. This is a huge change, but it will go a long way to getting us towards phpcs-compliance. And that means better code readability, and that means more participation. darcs-hash:20081223191907-84dde-21e8efe210e6d5d54e935a22d0cee5c7bbfc007d.gz
2008-08-28CSRF protection in imsettings.phpZach Copley
darcs-hash:20080829035707-7b5ce-69a9ff98390ff8b9671ede948d78fdb37371aac6.gz
2008-07-21Publish MicroIDs for email and mpp on profile and notice pages.mikec
darcs-hash:20080721120036-edabd-838335c0e23c80a657d353955b25b52a9a8624b2.gz
2008-07-13Resolve conflictMike Cochrane
darcs-hash:20080714025853-533db-e215a2ab0277acafc1c01d2c12c20ec452ed53e2.gz
2008-07-13Fixed location of bracket for gettext.Mike Cochrane
darcs-hash:20080713053033-533db-c1b4e827abd764dc173173556ec889290b0643bf.gz
2008-07-15replies from people you're not subscribed to over JabberEvan Prodromou
darcs-hash:20080715195513-84dde-454419c971015be385d9c4c35f7acbee419031f9.gz
2008-07-13fixing IM message, AGAINEvan Prodromou
darcs-hash:20080714022055-84dde-385e62dcea9c692262556d4e78b52f95212b512a.gz
2008-07-13conflict resolution after pulling from mikenzEvan Prodromou
darcs-hash:20080713215601-84dde-371d54221d9ffbed500e8d3c9e0ad4bb15bd5c30.gz
2008-07-13Colapse a lot of strings to make like easier for translators and more ↵Mike Cochrane
consisitant for users darcs-hash:20080713053748-533db-1cdb0cf3a9e4102eb139b74a7a9d4f97dadb20b8.gz
2008-07-13Merge some gettext strings to one line so translation tools are happierMike Cochrane
darcs-hash:20080713044608-533db-ee16aecee9b6d82b22ce6a25f6a9573c23eee9f8.gz
2008-07-13twiddle some parens in imsettings for gettextEvan Prodromou
darcs-hash:20080713130112-84dde-b3727f84de7db3bbe96b9d1003380b89402495de.gz
2008-07-08Translate a few more strings.Mike Cochrane
darcs-hash:20080708100519-533db-b326ea0bb16ea6c8244cfd00a0dd639d0553dd21.gz
2008-07-08Remove tralling whitespace on lines and a gettext replacement that I missed.Mike Cochrane
darcs-hash:20080708095113-533db-ad63bbde67b6275fb7ae944cc9882adf6f3be517.gz
2008-07-08Convert _t() to _() for gettext.Mike Cochrane
darcs-hash:20080708094531-533db-83399a46e6ec4c0fcc6249b0235961f969d1ae73.gz
2008-07-05optionally queue jabber confirmationsEvan Prodromou
darcs-hash:20080706035707-84dde-5403fe9bcb017c401fe5847527628df548e54499.gz
2008-07-02methodEvan Prodromou
darcs-hash:20080702131507-84dde-507a6380fcab66c1fbcbaad6d1399c8a2f210acf.gz
2008-06-30return instructionsEvan Prodromou
darcs-hash:20080630170653-84dde-e13ebf4ea364a6f12bb2692bc0278491a804c0fc.gz
2008-06-30refactor common behaviour in settings pagesEvan Prodromou
darcs-hash:20080630170342-84dde-5d7feb88a0a707b24c8070802a7ec99dd1f35687.gz
2008-06-27add a space between address and toEvan Prodromou
darcs-hash:20080627154825-84dde-b876f7dff5e1b72b94432e26cf8af02e2c36d0cc.gz
2008-06-27"subscribe" -> "add to buddy list"Evan Prodromou
darcs-hash:20080627143025-84dde-fee234fbcdf825cccc2ce0c9c812dcb27ebe6433.gz
2008-06-26don't bother with subscription hoohaw; just ask the user to do itEvan Prodromou
darcs-hash:20080626203103-34904-19ef53bc734622a310a705608f3e227e2f387904.gz
2008-06-26compile error with lost dotEvan Prodromou
darcs-hash:20080626190538-34904-d160176208203bcc806e824874c75021b32b6f92.gz
2008-06-26better instructions on confirmation codeEvan Prodromou
darcs-hash:20080626190307-34904-5aca9b62944d4e8f6170705dec822d30a1163401.gz
2008-06-26some variable names swapped around when I split up the big methodEvan Prodromou
darcs-hash:20080626184811-34904-d5d7373acb89b06eb3f0854d83b0ac425a70d1e2.gz
2008-06-26forgot to clone userEvan Prodromou
darcs-hash:20080626183721-34904-7c03b34e911ddb0c4adba959402d49476be932c1.gz