integrate local changes with Zach's

darcs-hash:20080916210813-84dde-c2cadb63b09f59ac6c76dc1205a56687de9483ce.gz

diff --git a/htaccess.sample b/htaccess.sample
index af7925b1d85491f00223de7831b1a71d4e924011..ce380666ec48cfc5f306baf9bf7ddb4cda31f0d7 100644 (file)
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -35,8 +35,9 @@ RewriteRule ^main/recoverpassword$ index.php?action=recoverpassword [L,QSA]
 RewriteRule ^main/recoverpassword/(.*)$ index.php?action=recoverpassword&code=$1 [L,QSA]
 RewriteRule ^main/invite$ index.php?action=invite [L,QSA]
 
-RewriteRule ^settings/avatar$ index.php?action=avatar [L,QSA]
-RewriteRule ^settings/password$ index.php?action=password [L,QSA]
+RewriteRule ^main/favor$ index.php?action=favor [L,QSA]
+RewriteRule ^main/disfavor$ index.php?action=disfavor [L,QSA]
+
 RewriteRule ^settings/profile$ index.php?action=profilesettings [L,QSA]
 RewriteRule ^settings/openid$ index.php?action=openidsettings [L,QSA]
 RewriteRule ^settings/im$ index.php?action=imsettings [L,QSA]

diff --git a/lib/common.php b/lib/common.php
index 8ea8fa0fad81b09164e44a8f84acb3ce8d01ff09..71a75ff10f06ff90983614704cd1c5fade9e5f82 100644 (file)
--- a/lib/common.php
+++ b/lib/common.php
@@ -97,7 +97,13 @@ $config =
                'daemon' =>
                array('piddir' => '/var/run',
                          'user' => false,
-                         'group' => false)
+                         'group' => false),
+               'integration' =>
+               array('source' => 'Laconica'), # source attribute for Twitter
+               'memcached' => 
+               array('enabled' => false,
+                         'server' => 'localhost',
+                         'port' => 11211)
                );
 
 $config['db'] = &PEAR::getStaticProperty('DB_DataObject','options');

diff --git a/scripts/xmppdaemon.php b/scripts/xmppdaemon.php
index d5f543b40ac5c29ac7736f028dc8d1652e5a4dbd..8c2e6c1688f2fd8630dd3c513cf0214e9f1cf4ad 100755 (executable)
--- a/scripts/xmppdaemon.php
+++ b/scripts/xmppdaemon.php
@@ -301,7 +301,4 @@ $resource = ($argc > 1) ? $argv[1] : (common_config('xmpp','resource') . '-liste
 
 $daemon = new XMPPDaemon($resource);
 
-if ($daemon->connect()) {
-       $daemon->set_status("Send me a message to post a notice");
-       $daemon->handle();
-}
+$daemon->runOnce();