GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

integrate local changes with Zach's

Browse Source 
darcs-hash:20080916210813-84dde-c2cadb63b09f59ac6c76dc1205a56687de9483ce.gz
This commit is contained in:
Evan Prodromou 2008-09-16 17:08:13 -04:00
parent 219927cb79
commit eb4df223e6
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htaccess.sample
View File

@ -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/recoverpassword/(.*)$ index.php?action=recoverpassword&code=$1 [L,QSA]
RewriteRule ^main/invite$ index.php?action=invite [L,QSA] RewriteRule ^main/invite$ index.php?action=invite [L,QSA]
RewriteRule ^settings/avatar$ index.php?action=avatar [L,QSA] RewriteRule ^main/favor$ index.php?action=favor [L,QSA]
RewriteRule ^settings/password$ index.php?action=password [L,QSA] RewriteRule ^main/disfavor$ index.php?action=disfavor [L,QSA]
RewriteRule ^settings/profile$ index.php?action=profilesettings [L,QSA] RewriteRule ^settings/profile$ index.php?action=profilesettings [L,QSA]
RewriteRule ^settings/openid$ index.php?action=openidsettings [L,QSA] RewriteRule ^settings/openid$ index.php?action=openidsettings [L,QSA]
RewriteRule ^settings/im$ index.php?action=imsettings [L,QSA] RewriteRule ^settings/im$ index.php?action=imsettings [L,QSA]

8
lib/common.php
View File

@ -97,7 +97,13 @@ $config =
'daemon' => 'daemon' =>
array('piddir' => '/var/run', array('piddir' => '/var/run',
'user' => false, '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'); $config['db'] = &PEAR::getStaticProperty('DB_DataObject','options');

5
scripts/xmppdaemon.php
View File

@ -301,7 +301,4 @@ $resource = ($argc > 1) ? $argv[1] : (common_config('xmpp','resource') . '-liste
$daemon = new XMPPDaemon($resource); $daemon = new XMPPDaemon($resource);
if ($daemon->connect()) { $daemon->runOnce();
$daemon->set_status("Send me a message to post a notice");
$daemon->handle();
}