diff options
| -rw-r--r-- | htaccess.sample | 5 | ||||
| -rw-r--r-- | lib/common.php | 8 | ||||
| -rwxr-xr-x | scripts/xmppdaemon.php | 5 |
3 files changed, 11 insertions, 7 deletions
diff --git a/htaccess.sample b/htaccess.sample index af7925b1d..ce380666e 100644 --- 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 8ea8fa0fa..71a75ff10 100644 --- 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 d5f543b40..8c2e6c168 100755 --- 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(); |