forked from GNUsocial/gnu-social
Merge branch '0.8.x' into queuemanager
This commit is contained in:
commit
00074cda73
@ -1,5 +1,4 @@
|
|||||||
InitializePlugin: a chance to initialize a plugin in a complete
|
InitializePlugin: a chance to initialize a plugin in a complete environment
|
||||||
environment
|
|
||||||
|
|
||||||
CleanupPlugin: a chance to cleanup a plugin at the end of a program
|
CleanupPlugin: a chance to cleanup a plugin at the end of a program
|
||||||
|
|
||||||
@ -117,3 +116,9 @@ EndLogout: After logging out
|
|||||||
|
|
||||||
ArgsInitialized: After the argument array has been initialized
|
ArgsInitialized: After the argument array has been initialized
|
||||||
- $args: associative array of arguments, can be modified
|
- $args: associative array of arguments, can be modified
|
||||||
|
|
||||||
|
StartAddressData: Allows the site owner to provide additional information about themselves for contact (e.g., tagline, email, location)
|
||||||
|
- $action: the current action
|
||||||
|
|
||||||
|
EndAddressData: At the end of <address>
|
||||||
|
- $action: the current action
|
||||||
|
@ -107,7 +107,7 @@ class ConversationAction extends Action
|
|||||||
|
|
||||||
function showContent()
|
function showContent()
|
||||||
{
|
{
|
||||||
$notices = Notice::conversationStream($this->id, 0, null);
|
$notices = Notice::conversationStream($this->id, null);
|
||||||
|
|
||||||
$ct = new ConversationTree($notices, $this);
|
$ct = new ConversationTree($notices, $this);
|
||||||
|
|
||||||
|
@ -159,7 +159,10 @@ class SubscriptionsListItem extends SubscriptionListItem
|
|||||||
$this->showBio();
|
$this->showBio();
|
||||||
$this->showTags();
|
$this->showTags();
|
||||||
// Relevant portion!
|
// Relevant portion!
|
||||||
|
$cur = common_current_user();
|
||||||
|
if (!empty($cur) && $cur->id == $this->owner->id) {
|
||||||
$this->showOwnerControls();
|
$this->showOwnerControls();
|
||||||
|
}
|
||||||
$this->endProfile();
|
$this->endProfile();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -36,6 +36,9 @@ $config['site']['path'] = 'laconica';
|
|||||||
// If you want logging sent to a file instead of syslog
|
// If you want logging sent to a file instead of syslog
|
||||||
// $config['site']['logfile'] = '/tmp/laconica.log';
|
// $config['site']['logfile'] = '/tmp/laconica.log';
|
||||||
|
|
||||||
|
// Change the syslog facility that Laconica logs to
|
||||||
|
// $config['syslog']['facility'] = LOG_LOCAL7;
|
||||||
|
|
||||||
// Enables extra log information, for example full details of PEAR DB errors
|
// Enables extra log information, for example full details of PEAR DB errors
|
||||||
// $config['site']['logdebug'] = true;
|
// $config['site']['logdebug'] = true;
|
||||||
|
|
||||||
|
@ -49,9 +49,10 @@ $(document).ready(function(){
|
|||||||
// run once in case there's something in there
|
// run once in case there's something in there
|
||||||
counter();
|
counter();
|
||||||
|
|
||||||
// set the focus
|
if($('body')[0].id != 'conversation') {
|
||||||
$("#notice_data-text").focus();
|
$("#notice_data-text").focus();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// XXX: refactor this code
|
// XXX: refactor this code
|
||||||
|
|
||||||
|
@ -383,6 +383,7 @@ class Action extends HTMLOutputter // lawsuit
|
|||||||
{
|
{
|
||||||
$this->elementStart('address', array('id' => 'site_contact',
|
$this->elementStart('address', array('id' => 'site_contact',
|
||||||
'class' => 'vcard'));
|
'class' => 'vcard'));
|
||||||
|
if (Event::handle('StartAddressData', array($this))) {
|
||||||
$this->elementStart('a', array('class' => 'url home bookmark',
|
$this->elementStart('a', array('class' => 'url home bookmark',
|
||||||
'href' => common_local_url('public')));
|
'href' => common_local_url('public')));
|
||||||
if (common_config('site', 'logo') || file_exists(theme_file('logo.png'))) {
|
if (common_config('site', 'logo') || file_exists(theme_file('logo.png'))) {
|
||||||
@ -392,6 +393,8 @@ class Action extends HTMLOutputter // lawsuit
|
|||||||
}
|
}
|
||||||
$this->element('span', array('class' => 'fn org'), common_config('site', 'name'));
|
$this->element('span', array('class' => 'fn org'), common_config('site', 'name'));
|
||||||
$this->elementEnd('a');
|
$this->elementEnd('a');
|
||||||
|
Event::handle('EndAddressData', array($this));
|
||||||
|
}
|
||||||
$this->elementEnd('address');
|
$this->elementEnd('address');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -124,7 +124,8 @@ $config =
|
|||||||
'dupelimit' => 60), # default for same person saying the same thing
|
'dupelimit' => 60), # default for same person saying the same thing
|
||||||
'syslog' =>
|
'syslog' =>
|
||||||
array('appname' => 'laconica', # for syslog
|
array('appname' => 'laconica', # for syslog
|
||||||
'priority' => 'debug'), # XXX: currently ignored
|
'priority' => 'debug', # XXX: currently ignored
|
||||||
|
'facility' => LOG_USER),
|
||||||
'queue' =>
|
'queue' =>
|
||||||
array('enabled' => false,
|
array('enabled' => false,
|
||||||
'subsystem' => 'db', # default to database, or 'stomp'
|
'subsystem' => 'db', # default to database, or 'stomp'
|
||||||
|
@ -214,7 +214,7 @@ class Rss10Action extends Action
|
|||||||
$this->element('cc:licence', array('rdf:resource' => common_config('license', 'url')));
|
$this->element('cc:licence', array('rdf:resource' => common_config('license', 'url')));
|
||||||
if ($notice->reply_to) {
|
if ($notice->reply_to) {
|
||||||
$replyurl = common_local_url('shownotice', array('notice' => $notice->reply_to));
|
$replyurl = common_local_url('shownotice', array('notice' => $notice->reply_to));
|
||||||
$this->element('sioc:reply_to', array('rdf:resource' => $replyurl));
|
$this->element('sioc:reply_of', array('rdf:resource' => $replyurl));
|
||||||
}
|
}
|
||||||
$this->elementEnd('item');
|
$this->elementEnd('item');
|
||||||
$this->creators[$creator_uri] = $profile;
|
$this->creators[$creator_uri] = $profile;
|
||||||
|
@ -978,7 +978,8 @@ function common_ensure_syslog()
|
|||||||
{
|
{
|
||||||
static $initialized = false;
|
static $initialized = false;
|
||||||
if (!$initialized) {
|
if (!$initialized) {
|
||||||
openlog(common_config('syslog', 'appname'), 0, LOG_USER);
|
openlog(common_config('syslog', 'appname'), 0,
|
||||||
|
common_config('syslog', 'facility'));
|
||||||
$initialized = true;
|
$initialized = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user