bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Merge branch 'master' of git://github.com/friendika/friendika

Browse source
This commit is contained in:
Tobias Diekershoff 2011-06-14 08:10:38 +02:00
parent 4d3c6941ca 9b9bd35cba
commit d08b068031
45 changed files with 362 additions and 133 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
addon/sniper/100x100.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 6.7 KiB

BIN
addon/sniper/100x100.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 30 KiB

BIN
addon/sniper/100x75.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
addon/sniper/100x80.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
addon/sniper/120x90hotshotsniper.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 16 KiB

BIN
addon/sniper/125x125.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 31 KiB

BIN
addon/sniper/140x90.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 17 KiB

BIN
addon/sniper/150x150.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 43 KiB

BIN
addon/sniper/160x86.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 9.2 KiB

BIN
addon/sniper/180x135.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
addon/sniper/250x180.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 39 KiB

BIN
addon/sniper/300x200.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 16 KiB

BIN
addon/sniper/300x300.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 19 KiB

BIN
addon/sniper/32x32.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
addon/sniper/335x185.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
addon/sniper/60x60.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 19 KiB

BIN
addon/sniper/64x64.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
addon/sniper/70x45.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 15 KiB

BIN
addon/sniper/70x60.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8 KiB

BIN
addon/sniper/73x80.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 9.2 KiB

BIN
addon/sniper/75x57.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 8.1 KiB

BIN
addon/sniper/80x60.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 7.7 KiB

BIN
addon/sniper/80x70.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 5.1 KiB

BIN
addon/sniper/80x80hotshotsniper.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 23 KiB

BIN
addon/sniper/81x67.jpg Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 9.6 KiB

11
addon/sniper/description_etc.txt Normal file
View file

@ -0,0 +1,11 @@
Description:
Shoot the targets with your sniper rifle!
Instructions:
Use your mouse to aim and shoot. Press R or Shift to Reload Press Space to use your Scope.
Dimensions:
620x480

15
addon/sniper/hotshotsniper.html Normal file
View file

@ -0,0 +1,15 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<title>hotshotsniper</title>
</head>
<body bgcolor="#000000">
<!--url's used in the movie-->
<!--text used in the movie-->
<!-- saved from url=(0013)about:internet -->
<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=8,0,0,0" width="620" height="480" id="hotshotsniper" align="middle">
<param name="allowScriptAccess" value="sameDomain" />
<param name="movie" value="hotshotsniper.swf" /><param name="quality" value="high" /><param name="bgcolor" value="#000000" /><embed src="hotshotsniper.swf" quality="high" bgcolor="#000000" width="620" height="480" name="hotshotsniper" align="middle" allowScriptAccess="sameDomain" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" />
</object>
</body>
</html>

BIN
addon/sniper/hotshotsniper.swf Normal file
View file

Binary file not shown.

31
addon/sniper/sniper.php Normal file
View file

@ -0,0 +1,31 @@
<?php
function sniper_install() {
register_hook('app_menu', 'addon/sniper/sniper.php', 'sniper_app_menu');
}
function sniper_uninstall() {
unregister_hook('app_menu', 'addon/sniper/sniper.php', 'sniper_app_menu');
}
function sniper_app_menu($a,&$b) {
$b['app_menu'] .= '<div class="app-title"><a href="sniper">Hot Shot Sniper</a></div>';
}
function sniper_module() {}
function sniper_content(&$a) {
$baseurl = $a->get_baseurl() . '/addon/sniper';
$o .= <<< EOT
<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=8,0,0,0" width="620" height="480" id="hotshotsniper" align="middle">
<param name="allowScriptAccess" value="sameDomain" />
<param name="movie" value="$baseurl/hotshotsniper.swf" /><param name="quality" value="high" /><param name="bgcolor" value="#000000" /><embed src="$baseurl/hotshotsniper.swf" quality="high" bgcolor="#000000" width="620" height="480" name="hotshotsniper" align="middle" allowScriptAccess="sameDomain" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" />
</object>
EOT;
return $o;
}

2
boot.php
View file

@ -4,7 +4,7 @@ set_time_limit(0);
ini_set('pcre.backtrack_limit', 250000); ini_set('pcre.backtrack_limit', 250000);
define ( 'FRIENDIKA_VERSION', '2.2.1007' ); define ( 'FRIENDIKA_VERSION', '2.2.1010' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1063 ); define ( 'DB_UPDATE_VERSION', 1063 );

BIN
images/icons.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.2 KiB

After

Width:  |  Height:  |  Size: 9.9 KiB

154
include/event.php
View file

@ -178,3 +178,157 @@ function ev_compare($a,$b) {
return strcmp($date_a,$date_b); return strcmp($date_a,$date_b);
} }
function event_store($arr) {
require_once('include/datetime.php');
require_once('include/items.php');
require_once('include/bbcode.php');
$a = get_app();
$arr['created'] = (($arr['created']) ? $arr['created'] : datetime_convert());
$arr['edited'] = (($arr['edited']) ? $arr['edited'] : datetime_convert());
$arr['type'] = (($arr['type']) ? $arr['type'] : 'event' );
$arr['cid'] = ((intval($arr['cid'])) ? intval($arr['cid']) : 0);
$arr['uri'] = (x($arr,'uri') ? $arr['uri'] : item_new_uri($a->get_hostname(),$arr['uid']));
if($arr['cid'])
$c = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($arr['cid']),
intval($arr['uid'])
);
else
$c = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
intval($arr['uid'])
);
if(count($c))
$contact = $c[0];
if($arr['id']) {
$r = q("UPDATE `event` SET
`edited` = '%s',
`start` = '%s',
`finish` = '%s',
`desc` = '%s',
`location` = '%s',
`type` = '%s',
`adjust` = %d,
`nofinish` = %d,
`allow_cid` = '%s',
`allow_gid` = '%s',
`deny_cid` = '%s',
`deny_gid` = '%s'
WHERE `id` = %d AND `uid` = %d LIMIT 1",
dbesc($arr['edited']),
dbesc($arr['start']),
dbesc($arr['finish']),
dbesc($arr['desc']),
dbesc($arr['location']),
dbesc($arr['type']),
intval($arr['adjust']),
intval($arr['nofinish']),
dbesc($arr['allow_cid']),
dbesc($arr['allow_gid']),
dbesc($arr['deny_cid']),
dbesc($arr['deny_gid']),
intval($arr['id']),
intval($arr['uid'])
);
$r = q("SELECT * FROM `item` WHERE `event-id` = %d AND `uid` = %d LIMIT 1",
intval($arr['id']),
intval($arr['uid'])
);
if(count($r))
return $r[0]['id'];
else
return 0;
}
else {
$r = q("INSERT INTO `event` ( `uid`,`cid`,`uri`,`created`,`edited`,`start`,`finish`,`desc`,`location`,`type`,
`adjust`,`nofinish`,`allow_cid`,`allow_gid`,`deny_cid`,`deny_gid`)
VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', '%s', '%s' ) ",
intval($arr['uid']),
intval($arr['cid']),
dbesc($arr['uri']),
dbesc($arr['created']),
dbesc($arr['edited']),
dbesc($arr['start']),
dbesc($arr['finish']),
dbesc($arr['desc']),
dbesc($arr['location']),
dbesc($arr['type']),
intval($arr['adjust']),
intval($arr['nofinish']),
dbesc($arr['allow_cid']),
dbesc($arr['allow_gid']),
dbesc($arr['deny_cid']),
dbesc($arr['deny_gid'])
);
$r = q("SELECT * FROM `event` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
dbesc($uri),
intval($arr['uid'])
);
if(count($r))
$event = $r[0];
$item_arr = array();
$item_arr['uid'] = $arr['uid'];
$item_arr['contact-id'] = $arr['cid'];
$item_arr['uri'] = $uri;
$item_arr['parent-uri'] = $uri;
$item_arr['type'] = 'activity';
$item_arr['wall'] = 1;
$item_arr['contact-id'] = $contact['id'];
$item_arr['owner-name'] = $contact['name'];
$item_arr['owner-link'] = $contact['url'];
$item_arr['owner-avatar'] = $contact['thumb'];
$item_arr['author-name'] = $contact['name'];
$item_arr['author-link'] = $contact['url'];
$item_arr['author-avatar'] = $contact['thumb'];
$item_arr['title'] = '';
$item_arr['allow_cid'] = $str_contact_allow;
$item_arr['allow_gid'] = $str_group_allow;
$item_arr['deny_cid'] = $str_contact_deny;
$item_arr['deny_gid'] = $str_group_deny;
$item_arr['last-child'] = 1;
$item_arr['visible'] = 1;
$item_arr['verb'] = ACTIVITY_POST;
$item_arr['object-type'] = ACTIVITY_OBJ_EVENT;
$item_arr['body'] = format_event_bbcode($event);
$item_arr['object'] = '<object><type>' . xmlify(ACTIVITY_OBJ_EVENT) . '</type><title></title><id>' . xmlify($uri) . '</id>';
$item_arr['object'] .= '<content>' . xmlify(format_event_bbcode($event)) . '</content>';
$item_arr['object'] .= '</object>' . "\n";
$item_id = item_store($item_arr);
$r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
intval($arr['uid'])
);
if(count($r))
$plink = $a->get_baseurl() . '/display/' . $r[0]['nickname'] . '/' . $item_id;
if($item_id) {
q("UPDATE `item` SET `plink` = '%s', `event-id` = %d WHERE `uid` = %d AND `id` = %d LIMIT 1",
dbesc($plink),
intval($event['id']),
intval($arr['uid']),
intval($item_id)
);
}
return $item_id;
}
}

12
include/items.php
View file

@ -1337,14 +1337,22 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $secure_fee
if((x($datarray,'object-type')) && ($datarray['object-type'] === ACTIVITY_OBJ_EVENT)) { if((x($datarray,'object-type')) && ($datarray['object-type'] === ACTIVITY_OBJ_EVENT)) {
$ev = bbtoevent($datarray['body']); $ev = bbtoevent($datarray['body']);
if(x($ev,'desc') && x($ev,'start')) { if(x($ev,'desc') && x($ev,'start')) {
$ev['uid'] = $importer['uid'];
$ev['uri'] = $item_id;
if(is_array($contact))
$ev['cid'] = $contact['id'];
$r = q("SELECT * FROM `event` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", $r = q("SELECT * FROM `event` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
dbesc($item_id), dbesc($item_id),
intval($importer['uid']) intval($importer['uid'])
); );
// import/update event if(count($r))
$ev['id'] = $r[0]['id'];
$xyz = event_store($ev);
continue;
} }
} }
$r = q("SELECT `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", $r = q("SELECT `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
dbesc($item_id), dbesc($item_id),
intval($importer['uid']) intval($importer['uid'])

4
include/nav.php
View file

@ -64,8 +64,8 @@ function nav(&$a) {
$nav['help'] = array($help_url, t('Help'), ""); $nav['help'] = array($help_url, t('Help'), "");
if($a->apps)
$nav['apps'] = array('apps', t('Apps'), ""); $nav['apps'] = array('apps', t('Apps'), "");
$nav['search'] = array('search', t('Search'), ""); $nav['search'] = array('search', t('Search'), "");

2
include/notifier.php
View file

@ -512,6 +512,8 @@ function notifier_run($argv, $argc){
if((count($r)) && (($max_allowed == 0) || (count($r) < $max_allowed))) { if((count($r)) && (($max_allowed == 0) || (count($r) < $max_allowed))) {
logger('pubdeliver: ' . print_r($r,true));
foreach($r as $rr) { foreach($r as $rr) {
/* Don't deliver to folks who have already been delivered to */ /* Don't deliver to folks who have already been delivered to */

14
mod/apps.php
View file

@ -5,19 +5,9 @@ function apps_content(&$a) {
$o .= '<h3>' . t('Applications') . '</h3>'; $o .= '<h3>' . t('Applications') . '</h3>';
$apps = false; if($a->apps)
if(local_user()) {
$apps = true;
$o .= '<div class="app-title"><a href="notes">' . t('Private Notes') . '</a></div>';
}
if($a->apps) {
$apps = true;
$o .= $a->apps; $o .= $a->apps;
} else
if(! $apps)
notice( t('No installed applications.') . EOL); notice( t('No installed applications.') . EOL);
return $o; return $o;

21
mod/dfrn_notify.php
View file

@ -2,6 +2,9 @@
require_once('simplepie/simplepie.inc'); require_once('simplepie/simplepie.inc');
require_once('include/items.php'); require_once('include/items.php');
require_once('include/event.php');
function dfrn_notify_post(&$a) { function dfrn_notify_post(&$a) {
$dfrn_id = ((x($_POST,'dfrn_id')) ? notags(trim($_POST['dfrn_id'])) : ''); $dfrn_id = ((x($_POST,'dfrn_id')) ? notags(trim($_POST['dfrn_id'])) : '');
@ -591,6 +594,24 @@ function dfrn_notify_post(&$a) {
$item_id = $item->get_id(); $item_id = $item->get_id();
$datarray = get_atom_elements($feed,$item); $datarray = get_atom_elements($feed,$item);
if((x($datarray,'object-type')) && ($datarray['object-type'] === ACTIVITY_OBJ_EVENT)) {
$ev = bbtoevent($datarray['body']);
if(x($ev,'desc') && x($ev,'start')) {
$ev['cid'] = $importer['id'];
$ev['uid'] = $importer['uid'];
$ev['uri'] = $item_id;
$r = q("SELECT * FROM `event` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
dbesc($item_id),
intval($importer['uid'])
);
if(count($r))
$ev['id'] = $r[0]['id'];
$xyz = event_store($ev);
continue;
}
}
$r = q("SELECT `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", $r = q("SELECT `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
dbesc($item_id), dbesc($item_id),
intval($importer['importer_uid']) intval($importer['importer_uid'])

145
mod/events.php
View file

@ -67,113 +67,28 @@ function events_post(&$a) {
$str_group_allow = $str_contact_deny = $str_group_deny = ''; $str_group_allow = $str_contact_deny = $str_group_deny = '';
} }
if($event_id) {
$r = q("UPDATE `event` SET
`edited` = '%s',
`start` = '%s',
`finish` = '%s',
`desc` = '%s',
`location` = '%s',
`type` = '%s',
`adjust` = %d,
`nofinish` = %d,
`allow_cid` = '%s',
`allow_gid` = '%s',
`deny_cid` = '%s',
`deny_gid` = '%s'
WHERE `id` = %d AND `uid` = %d LIMIT 1",
dbesc(datetime_convert()), $datarray = array();
dbesc($start), $datarray['start'] = $start;
dbesc($finish), $datarray['finish'] = $finish;
dbesc($desc), $datarray['desc'] = $desc;
dbesc($location), $datarray['location'] = $location;
dbesc($type), $datarray['type'] = $type;
intval($adjust), $datarray['adjust'] = $adjust;
intval($nofinish), $datarray['nofinish'] = $nofinish;
dbesc($str_contact_allow), $datarray['uid'] = $uid;
dbesc($str_group_allow), $datarray['cid'] = 0;
dbesc($str_contact_deny), $datarray['allow_cid'] = $str_contact_allow;
dbesc($str_group_deny), $datarray['allow_gid'] = $str_group_allow;
intval($event_id), $datarray['deny_cid'] = $str_contact_deny;
intval($local_user()) $datarray['deny_gid'] = $str_group_deny;
); $datarray['id'] = $event_id;
$datarray['created'] = $created;
$datarray['edited'] = $edited;
} $item_id = event_store($datarray);
else { proc_run('php',"include/notifier.php","event","$item_id");
$uri = item_new_uri($a->get_hostname(),local_user());
$r = q("INSERT INTO `event` ( `uid`,`uri`,`created`,`edited`,`start`,`finish`,`desc`,`location`,`type`,
`adjust`,`nofinish`,`allow_cid`,`allow_gid`,`deny_cid`,`deny_gid`)
VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', '%s', '%s' ) ",
intval(local_user()),
dbesc($uri),
dbesc(datetime_convert()),
dbesc(datetime_convert()),
dbesc($start),
dbesc($finish),
dbesc($desc),
dbesc($location),
dbesc($type),
intval($adjust),
intval($nofinish),
dbesc($str_contact_allow),
dbesc($str_group_allow),
dbesc($str_contact_deny),
dbesc($str_group_deny)
);
$r = q("SELECT * FROM `event` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
dbesc($uri),
intval(local_user())
);
if(count($r))
$event = $r[0];
$arr = array();
$arr['uid'] = local_user();
$arr['uri'] = $uri;
$arr['parent-uri'] = $uri;
$arr['type'] = 'activity';
$arr['wall'] = 1;
$arr['contact-id'] = $a->contact['id'];
$arr['owner-name'] = $a->contact['name'];
$arr['owner-link'] = $a->contact['url'];
$arr['owner-avatar'] = $a->contact['thumb'];
$arr['author-name'] = $a->contact['name'];
$arr['author-link'] = $a->contact['url'];
$arr['author-avatar'] = $a->contact['thumb'];
$arr['title'] = '';
$arr['allow_cid'] = $str_contact_allow;
$arr['allow_gid'] = $str_group_allow;
$arr['deny_cid'] = $str_contact_deny;
$arr['deny_gid'] = $str_group_deny;
$arr['last-child'] = 1;
$arr['visible'] = 1;
$arr['verb'] = ACTIVITY_POST;
$arr['object-type'] = ACTIVITY_OBJ_EVENT;
$arr['body'] = format_event_bbcode($event);
$arr['object'] = '<object><type>' . xmlify(ACTIVITY_OBJ_EVENT) . '</type><title></title><id>' . xmlify($uri) . '</id>';
$arr['object'] .= '<content>' . xmlify(format_event_bbcode($event)) . '</content>';
$arr['object'] .= '</object>' . "\n";
$item_id = item_store($arr);
if($item_id) {
q("UPDATE `item` SET `plink` = '%s', `event-id` = %d WHERE `uid` = %d AND `id` = %d LIMIT 1",
dbesc($a->get_baseurl() . '/display/' . $owner_record['nickname'] . '/' . $item_id),
intval($event['id']),
intval(local_user()),
intval($item_id)
);
proc_run('php',"include/notifier.php","tag","$item_id");
}
}
} }
@ -215,6 +130,14 @@ function events_content(&$a) {
if(! $m) if(! $m)
$m = intval($thismonth); $m = intval($thismonth);
// Put some limits on dates. The PHP date functions don't seem to do so well before 1900.
// An upper limit was chosen to keep search engines from exploring links endlessly.
if($y < 1901)
$y = 1900;
if($y > 2099)
$y = 2100;
$nextyear = $y; $nextyear = $y;
$nextmonth = $m + 1; $nextmonth = $m + 1;
if($nextmonth > 12) { if($nextmonth > 12) {
@ -230,10 +153,17 @@ function events_content(&$a) {
$prevyear --; $prevyear --;
} }
$o .= '<div id="new-event-link"><a href="' . $a->get_baseurl() . '/events/new' . '" >' . t('Create New Event') . '</a></div>'; $o .= '<div id="new-event-link"><a href="' . $a->get_baseurl() . '/events/new' . '" >' . t('Create New Event') . '</a></div>';
$o .= '<a href="' . $a->get_baseurl() . '/events/' . $prevyear . '/' . $prevmonth . '" class="prevcal">' . t('&lt;&lt; Previous') . '</a> | <a href="' . $a->get_baseurl() . '/events/' . $nextyear . '/' . $nextmonth . '" class="nextcal">' . t('Next &gt;&gt;') . '</a>'; $o .= '<div id="event-calendar-wrapper">';
$o .= '<a href="' . $a->get_baseurl() . '/events/' . $prevyear . '/' . $prevmonth . '" class="prevcal"><div id="event-calendar-prev" class="icon prev" title="' . t('Previous') . '"></div></a>';
$o .= cal($y,$m,false, ' eventcal'); $o .= cal($y,$m,false, ' eventcal');
$o .= '<a href="' . $a->get_baseurl() . '/events/' . $nextyear . '/' . $nextmonth . '" class="nextcal"><div id="event-calendar-next" class="icon next" title="' . t('Next') . '"></div></a>';
$o .= '</div>';
$o .= '<div class="event-calendar-end"></div>';
$dim = get_dim($y,$m); $dim = get_dim($y,$m);
$start = sprintf('%d-%d-%d %d:%d:%d',$y,$m,1,0,0,0); $start = sprintf('%d-%d-%d %d:%d:%d',$y,$m,1,0,0,0);
$finish = sprintf('%d-%d-%d %d:%d:%d',$y,$m,$dim,23,59,59); $finish = sprintf('%d-%d-%d %d:%d:%d',$y,$m,$dim,23,59,59);
@ -245,7 +175,8 @@ function events_content(&$a) {
$adjust_finish = datetime_convert('UTC', date_default_timezone_get(), $finish); $adjust_finish = datetime_convert('UTC', date_default_timezone_get(), $finish);
$r = q("SELECT * FROM `event` WHERE `uid` = %d $r = q("SELECT `event`.*, `item`.`id` AS `itemid`,`item`.`plink` FROM `event` LEFT JOIN `item` ON `item`.`event-id` = `event`.`id`
WHERE `event`.`uid` = %d
AND (( `adjust` = 0 AND `start` >= '%s' AND `finish` <= '%s' ) AND (( `adjust` = 0 AND `start` >= '%s' AND `finish` <= '%s' )
OR ( `adjust` = 1 AND `start` >= '%s' AND `finish` <= '%s' )) ", OR ( `adjust` = 1 AND `start` >= '%s' AND `finish` <= '%s' )) ",
intval(local_user()), intval(local_user()),
@ -269,6 +200,8 @@ function events_content(&$a) {
$o .= '<hr /><div class="event-list-date">' . $d . '</div>'; $o .= '<hr /><div class="event-list-date">' . $d . '</div>';
$last_date = $d; $last_date = $d;
$o .= format_event_html($rr); $o .= format_event_html($rr);
if($rr['plink'])
$o .= get_plink($rr) . '<br />';
} }
} }
return $o; return $o;

2
mod/notes.php
View file

@ -38,7 +38,7 @@ function notes_content(&$a) {
$is_owner = true; $is_owner = true;
$o .= '<h3>' . t('Private Notes') . '</h3>'; $o .= '<h3>' . t('Personal Notes') . '</h3>';
$commpage = false; $commpage = false;
$commvisitor = false; $commvisitor = false;

4
mod/photos.php
View file

@ -1041,7 +1041,7 @@ function photos_content(&$a) {
} }
if($prevlink) if($prevlink)
$prevlink = array($prevlink, t('<< Prev')) ; $prevlink = array($prevlink, '<div class="icon prev"></div>') ;
$photo = array( $photo = array(
'href' => $a->get_baseurl() . '/photo/' . $hires['resource-id'] . '-' . $hires['scale'] . '.jpg', 'href' => $a->get_baseurl() . '/photo/' . $hires['resource-id'] . '-' . $hires['scale'] . '.jpg',
@ -1050,7 +1050,7 @@ function photos_content(&$a) {
); );
if($nextlink) if($nextlink)
$nextlink = array($nextlink, t('Next >>')); $nextlink = array($nextlink, '<div class="icon next"></div>');
// Do we have an item for this photo? // Do we have an item for this photo?

4
mod/profile.php
View file

@ -115,7 +115,9 @@ function profile_content(&$a, $update = 0) {
'$phototab' => $a->get_baseurl() . '/photos/' . $a->profile['nickname'], '$phototab' => $a->get_baseurl() . '/photos/' . $a->profile['nickname'],
'$status' => t('Status'), '$status' => t('Status'),
'$profile' => t('Profile'), '$profile' => t('Profile'),
'$photos' => t('Photos') '$photos' => t('Photos'),
'$events' => (($is_owner) ? '<a href="events" id="profile-tab-events-link" class="profile-tabs" >' . t('Events') . '</a>' : ''),
'$notes' => (($is_owner) ? '<a href="notes" id="profile-tab-notes-link" class="profile-tabs" >' . t('Personal Notes') . '</a>' : '')
)); ));

8
mod/pubsub.php
View file

@ -91,10 +91,10 @@ function pubsub_post(&$a) {
logger('pubsub: user-agent: ' . $_SERVER['HTTP_USER_AGENT'] ); logger('pubsub: user-agent: ' . $_SERVER['HTTP_USER_AGENT'] );
logger('pubsub: data: ' . $xml, LOGGER_DATA); logger('pubsub: data: ' . $xml, LOGGER_DATA);
if(! stristr($xml,'<?xml')) { // if(! stristr($xml,'<?xml')) {
logger('pubsub_post: bad xml'); // logger('pubsub_post: bad xml');
hub_post_return(); // hub_post_return();
} // }
$nick = (($a->argc > 1) ? notags(trim($a->argv[1])) : ''); $nick = (($a->argc > 1) ? notags(trim($a->argv[1])) : '');
$contact_id = (($a->argc > 2) ? intval($a->argv[2]) : 0 ); $contact_id = (($a->argc > 2) ? intval($a->argv[2]) : 0 );

2
view/profile_tabs.tpl
View file

@ -3,5 +3,7 @@
<a href="$url" id="profile-tab-status-link" class="profile-tabs" >$status</a> <a href="$url" id="profile-tab-status-link" class="profile-tabs" >$status</a>
<a href="$url?tab=profile" id="profile-tab-profile-link" class="profile-tabs" >$profile</a> <a href="$url?tab=profile" id="profile-tab-profile-link" class="profile-tabs" >$profile</a>
<a href="$phototab" id="profile-tab-photos-link" class="profile-tabs" >$photos</a> <a href="$phototab" id="profile-tab-photos-link" class="profile-tabs" >$photos</a>
$events
$notes
<div id="profile-tabs-end"></div> <div id="profile-tabs-end"></div>
</div> </div>

18
view/theme/duepuntozero/style.css
View file

@ -2224,7 +2224,8 @@ a.mail-list-link {
} }
.eventcal { .eventcal {
font-size: 24px; float: left;
font-size: 20px;
} }
#new-event-link { #new-event-link {
@ -2246,6 +2247,17 @@ a.mail-list-link {
float: right; float: right;
} }
.prevcal, .nextcal {
float: left;
margin-left: 32px;
margin-right: 32px;
margin-top: 64px;
}
.event-calendar-end {
clear: both;
}
.calendar { .calendar {
font-family: Courier, monospace; font-family: Courier, monospace;
} }
@ -2454,6 +2466,8 @@ a.mail-list-link {
} }
#lang-select-icon { #lang-select-icon {
cursor: pointer; cursor: pointer;
position: absolute; position: absolute;
@ -2505,6 +2519,8 @@ a.mail-list-link {
.youtube { background-position: -64px -32px;} .youtube { background-position: -64px -32px;}
.attach { background-position: -80px -32px; } .attach { background-position: -80px -32px; }
.language { background-position: -96px -32px; } .language { background-position: -96px -32px; }
.prev { background-position: -112px -32px; }
.next { background-position: -128px -32px; }
.attachtype { .attachtype {

44
view/theme/loozah/style.css
View file

@ -2423,6 +2423,48 @@ a.mail-list-link {
color: #FF0000; color: #FF0000;
} }
.eventcal {
float: left;
font-size: 20px;
}
#new-event-link {
margin-bottom: 10px;
}
.event-description:before {
content: url('../../../images/calendar.png');
margin-right: 15px;
}
.event-start, .event-end {
margin-left: 10px;
width: 330px;
clear: both;
}
.event-start .dtstart, .event-end .dtend {
float: right;
}
.prevcal, .nextcal {
float: left;
margin-left: 32px;
margin-right: 32px;
margin-top: 64px;
}
.event-calendar-end {
clear: both;
}
.calendar {
font-family: Courier, monospace;
}
.today {
color: #FF0000;
}
#event-start-text, #event-finish-text { #event-start-text, #event-finish-text {
margin-top: 10px; margin-top: 10px;
margin-bottom: 5px; margin-bottom: 5px;
@ -2491,6 +2533,8 @@ a.mail-list-link {
.youtube { background-position: -64px -32px;} .youtube { background-position: -64px -32px;}
.attach { background-position: -80px -32px; } .attach { background-position: -80px -32px; }
.language { background-position: -96px -32px; } .language { background-position: -96px -32px; }
.prev { background-position: -112px -32px; }
.next { background-position: -128px -32px; }
.attachtype { .attachtype {
display: block; width: 20px; height: 23px; display: block; width: 20px; height: 23px;