Merge branch '0.8.x' into stats

Conflicts:
	README

diff --combined README
index 136b537c7d0def0ea0baab1b2eacc0046228da15,4f93829601e267c2a381cbdf6bc068008c295aea..9207f3e900ddfa8251d530ac44e8c7e782fc6b7c
--- 1/README
--- 2/README
+++ b/README
@@@ -1133,32 -1133,9 +1133,35 @@@ welcome: nickname of a user account tha
           busy servers it may be a good idea to keep that one just for
           'urgent' messages. Default is null; no message.
  
+ If either of these special user accounts are specified, the users should
+ be created before the configuration is updated.
+ 
 +snapshot
 +--------
 +
 +The software will, by default, send statistical snapshots about the
 +local installation to a stats server on the laconi.ca Web site. This
 +data is used by the developers to prioritize development decisions. No
 +identifying data about users or organizations is collected. The data
 +is available to the public for review. Participating in this survey
 +helps Laconica developers take your needs into account when updating
 +the software.
 +
 +run: string indicating when to run the statistics. Values can be 'web'
 +     (run occasionally at Web time), 'cron' (run from a cron script),
 +     or 'never' (don't ever run). If you set it to 'cron', remember to
 +     schedule the script to run on a regular basis.
 +frequency: if run value is 'web', how often to report statistics.
 +           Measured in Web hits; depends on how active your site is.
 +           Default is 10000 -- that is, one report every 10000 Web hits,
 +           on average.
 +reporturl: URL to post statistics to. Defaults to Laconica developers'
 +           report system, but if they go evil or disappear you may
 +           need to update this to another value. Note: if you
 +           don't want to report stats, it's much better to
 +           set 'run' to 'never' than to set this value to something
 +           nonsensical.
 +
  Troubleshooting
  ===============
  

diff --combined index.php
index 3f25e004d7054e896de16df6a14e4cd875234d7b,9ff1c2c56aac54cd385f416ba07953497cf5f8b8..b79fefc85af4281873a60ae229f6219320ff7d1b
--- 1/index.php
--- 2/index.php
+++ b/index.php
@@@ -63,10 -63,12 +63,14 @@@ function handleError($error
  
  function main()
  {
+     // quick check for fancy URL auto-detection support in installer.
+     if (isset($_SERVER['REDIRECT_URL']) && ('/check-fancy' === $_SERVER['REDIRECT_URL'])) {
+         die("Fancy URL support detection succeeded. We suggest you enable this to get fancy (pretty) URLs.");
+     }
      global $user, $action, $config;
  
 +    Snapshot::check();
 +    
      if (!_have_config()) {
          $msg = sprintf(_("No configuration file found. Try running ".
                           "the installation program first."));
@@@ -102,6 -104,8 +106,8 @@@
      }
  
      $args = array_merge($args, $_REQUEST);
+ 
+     Event::handle('ArgsInitialize', array(&$args));
  
      $action = $args['action'];
  

diff --combined lib/common.php
index e64ca34da83fe5617b750a8c1298c2a2577dc11d,3feba1d8bd95dd845045ac506ca700f722097268..0ce46442deb99e3d928aed6bfa16c96b1a488401
--- 1/lib/common.php
--- 2/lib/common.php
+++ b/lib/common.php
@@@ -143,6 -143,8 +143,8 @@@ $config 
          array('piddir' => '/var/run',
                'user' => false,
                'group' => false),
+         'twitterbridge' =>
+         array('enabled' => false),
          'integration' =>
          array('source' => 'Laconica', # source attribute for Twitter
                'taguri' => $_server.',2009'), # base for tag URIs
@@@ -157,10 -159,6 +159,10 @@@
          'newuser' =>
          array('subscribe' => null,
                'welcome' => null),
 +        'snapshot' =>
 +        array('run' => 'web',
 +              'frequency' => 10000,
 +              'reporturl' => 'http://laconi.ca/stats/report'),
          );
  
  $config['db'] = &PEAR::getStaticProperty('DB_DataObject','options');
@@@ -197,7 -195,7 +199,7 @@@ $_config_files[] = INSTALLDIR.'/config.
  $_have_a_config = false;
  
  foreach ($_config_files as $_config_file) {
-     if (file_exists($_config_file)) {
+     if (@file_exists($_config_file)) {
          include_once($_config_file);
          $_have_a_config = true;
      }