harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

typo

Browse Source
This commit is contained in:
friendica 2013-01-16 02:01:23 -08:00
parent a9f4a47a35
commit f1afe68052
3 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
install/update.php
View File

@ -280,7 +280,7 @@ ADD INDEX ( `event_hash` )");
function update_r1019() { function update_r1019() {
$r = q"ALTER TABLE `event` DROP `message_id` "); $r = q("ALTER TABLE `event` DROP `message_id` ");
if($r) if($r)
return UPDATE_SUCCESS; return UPDATE_SUCCESS;
return UPDATE_FAILED; return UPDATE_FAILED;

31
mod/ping.php
View File

@ -181,6 +181,37 @@ function ping_init(&$a) {
} }
if(argc() > 1 && (argv(1) === 'all_events')) {
$result = array();
$r = q("SELECT * FROM event left join xchan on event_xchan = xchan_hash
WHERE `event`.`uid` = %d AND start < '%s' AND start > '%s' and `ignore` = 0
ORDER BY `start` DESC ",
intval(local_user()),
dbesc(datetime_convert('UTC',date_default_timezone_get(),'now + 7 days')),
dbesc(datetime_convert('UTC',date_default_timezone_get(),'now - 1 days'))
);
if($r) {
foreach($r as $rr) {
$result[] = array(
'notify_link' => $a->get_baseurl() . '/events/' . $rr['event_hash'],
'name' => $rr['xchan_name'],
'url' => $rr['xchan_url'],
'photo' => $rr['xchan_photo_s'],
'when' => relative_date($rr['start']),
'class' => ('notify-unseen'),
'message' => t('posted an event')
);
}
}
logger('ping: ' . print_r($result,true));
echo json_encode(array('notify' => $result));
killme();
}
// Normal ping - just the counts // Normal ping - just the counts

10
view/tpl/nav.tpl
View File

@ -48,12 +48,12 @@
{{ endif }} {{ endif }}
{{ if $nav.all_events }} {{ if $nav.all_events }}
<li id="nav-all-events-link" class="nav-menu $sel.all_events"> <li id="nav-all_events-link" class="nav-menu $sel.all_events">
<a class="$nav.all_events.2" href="$nav.all_events.0" title="$nav.all_events.3" ><span class="icon events">$nav.all_events.1</span></a> <a class="$nav.all_events.2" href="$nav.all_events.0" title="$nav.all_events.3" ><span class="icon events">$nav.all_events.1</span></a>
<span id="all-events-update" class="nav-notify fakelink" rel="#nav-events-menu"></span> <span id="all-all_events-update" class="nav-notify fakelink" rel="#nav-all_events-menu"></span>
<ul id="nav-events-menu" class="menu-popup notify-menus" rel="events"> <ul id="nav-all_events-menu" class="menu-popup notify-menus" rel="all_events">
<li id="nav-events-see-all"><a href="$nav.events.all.0">$nav.events.all.1</a></li> <li id="nav-all_events-see-all"><a href="$nav.all_events.all.0">$nav.all_events.all.1</a></li>
<li id="nav-events-mark-all"><a href="#" onclick="/*fixme*/ return false;">$nav.events.mark.1</a></li> <li id="nav-all_events-mark-all"><a href="#" onclick="/*fixme*/ return false;">$nav.all_events.mark.1</a></li>
<li class="empty">$emptynotifications</li> <li class="empty">$emptynotifications</li>
</ul> </ul>
</li> </li>