Events: Query improvement
This commit is contained in:
parent
4554526515
commit
c6e605992b
1 changed files with 50 additions and 48 deletions
40
mod/events.php
Executable file → Normal file
40
mod/events.php
Executable file → Normal file
|
@ -7,7 +7,7 @@ require_once('include/items.php');
|
||||||
|
|
||||||
function events_post(&$a) {
|
function events_post(&$a) {
|
||||||
|
|
||||||
logger('post: ' . print_r($_REQUEST,true));
|
logger('post: ' . print_r($_REQUEST,true));
|
||||||
|
|
||||||
if(! local_user())
|
if(! local_user())
|
||||||
return;
|
return;
|
||||||
|
@ -16,7 +16,7 @@ function events_post(&$a) {
|
||||||
$cid = ((x($_POST,'cid')) ? intval($_POST['cid']) : 0);
|
$cid = ((x($_POST,'cid')) ? intval($_POST['cid']) : 0);
|
||||||
$uid = local_user();
|
$uid = local_user();
|
||||||
|
|
||||||
$start_text = escape_tags($_REQUEST['start_text']);
|
$start_text = escape_tags($_REQUEST['start_text']);
|
||||||
$finish_text = escape_tags($_REQUEST['finish_text']);
|
$finish_text = escape_tags($_REQUEST['finish_text']);
|
||||||
|
|
||||||
$adjust = intval($_POST['adjust']);
|
$adjust = intval($_POST['adjust']);
|
||||||
|
@ -25,23 +25,23 @@ function events_post(&$a) {
|
||||||
// The default setting for the `private` field in event_store() is false, so mirror that
|
// The default setting for the `private` field in event_store() is false, so mirror that
|
||||||
$private_event = false;
|
$private_event = false;
|
||||||
|
|
||||||
if($start_text) {
|
if($start_text) {
|
||||||
$start = $start_text;
|
$start = $start_text;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$start = sprintf('%d-%d-%d %d:%d:0',$startyear,$startmonth,$startday,$starthour,$startminute);
|
$start = sprintf('%d-%d-%d %d:%d:0',$startyear,$startmonth,$startday,$starthour,$startminute);
|
||||||
}
|
}
|
||||||
|
|
||||||
if($nofinish) {
|
if($nofinish) {
|
||||||
$finish = '0000-00-00 00:00:00';
|
$finish = '0000-00-00 00:00:00';
|
||||||
}
|
}
|
||||||
|
|
||||||
if($finish_text) {
|
if($finish_text) {
|
||||||
$finish = $finish_text;
|
$finish = $finish_text;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$finish = sprintf('%d-%d-%d %d:%d:0',$finishyear,$finishmonth,$finishday,$finishhour,$finishminute);
|
$finish = sprintf('%d-%d-%d %d:%d:0',$finishyear,$finishmonth,$finishday,$finishhour,$finishminute);
|
||||||
}
|
}
|
||||||
|
|
||||||
if($adjust) {
|
if($adjust) {
|
||||||
$start = datetime_convert(date_default_timezone_get(),'UTC',$start);
|
$start = datetime_convert(date_default_timezone_get(),'UTC',$start);
|
||||||
|
@ -69,7 +69,7 @@ function events_post(&$a) {
|
||||||
|
|
||||||
if((! $summary) || (! $start)) {
|
if((! $summary) || (! $start)) {
|
||||||
notice( t('Event title and start time are required.') . EOL);
|
notice( t('Event title and start time are required.') . EOL);
|
||||||
if(intval($_REQUEST['preview'])) {
|
if(intval($_REQUEST['preview'])) {
|
||||||
echo( t('Event title and start time are required.'));
|
echo( t('Event title and start time are required.'));
|
||||||
killme();
|
killme();
|
||||||
}
|
}
|
||||||
|
@ -134,10 +134,10 @@ function events_post(&$a) {
|
||||||
$datarray['created'] = $created;
|
$datarray['created'] = $created;
|
||||||
$datarray['edited'] = $edited;
|
$datarray['edited'] = $edited;
|
||||||
|
|
||||||
if(intval($_REQUEST['preview'])) {
|
if(intval($_REQUEST['preview'])) {
|
||||||
$html = format_event_html($datarray);
|
$html = format_event_html($datarray);
|
||||||
echo $html;
|
echo $html;
|
||||||
killme();
|
killme();
|
||||||
}
|
}
|
||||||
|
|
||||||
$item_id = event_store($datarray);
|
$item_id = event_store($datarray);
|
||||||
|
@ -217,8 +217,8 @@ function events_content(&$a) {
|
||||||
if($mode == 'view') {
|
if($mode == 'view') {
|
||||||
|
|
||||||
|
|
||||||
$thisyear = datetime_convert('UTC',date_default_timezone_get(),'now','Y');
|
$thisyear = datetime_convert('UTC',date_default_timezone_get(),'now','Y');
|
||||||
$thismonth = datetime_convert('UTC',date_default_timezone_get(),'now','m');
|
$thismonth = datetime_convert('UTC',date_default_timezone_get(),'now','m');
|
||||||
if(! $y)
|
if(! $y)
|
||||||
$y = intval($thisyear);
|
$y = intval($thisyear);
|
||||||
if(! $m)
|
if(! $m)
|
||||||
|
@ -266,17 +266,19 @@ function events_content(&$a) {
|
||||||
|
|
||||||
if (x($_GET,'id')){
|
if (x($_GET,'id')){
|
||||||
$r = q("SELECT `event`.*, `item`.`id` AS `itemid`,`item`.`plink`,
|
$r = q("SELECT `event`.*, `item`.`id` AS `itemid`,`item`.`plink`,
|
||||||
`item`.`author-name`, `item`.`author-avatar`, `item`.`author-link` FROM `event` LEFT JOIN `item` ON `item`.`event-id` = `event`.`id`
|
`item`.`author-name`, `item`.`author-avatar`, `item`.`author-link` FROM `event`
|
||||||
|
LEFT JOIN `item` ON `item`.`event-id` = `event`.`id` AND `item`.`uid` = `event`.`uid`
|
||||||
WHERE `event`.`uid` = %d AND `event`.`id` = %d",
|
WHERE `event`.`uid` = %d AND `event`.`id` = %d",
|
||||||
intval(local_user()),
|
intval(local_user()),
|
||||||
intval($_GET['id'])
|
intval($_GET['id'])
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
$r = q("SELECT `event`.*, `item`.`id` AS `itemid`,`item`.`plink`,
|
$r = q("SELECT `event`.*, `item`.`id` AS `itemid`,`item`.`plink`,
|
||||||
`item`.`author-name`, `item`.`author-avatar`, `item`.`author-link` FROM `event` LEFT JOIN `item` ON `item`.`event-id` = `event`.`id`
|
`item`.`author-name`, `item`.`author-avatar`, `item`.`author-link` FROM `event`
|
||||||
|
LEFT JOIN `item` ON `item`.`event-id` = `event`.`id` AND `item`.`uid` = `event`.`uid`
|
||||||
WHERE `event`.`uid` = %d and event.ignore = %d
|
WHERE `event`.`uid` = %d and event.ignore = %d
|
||||||
AND (( `adjust` = 0 AND ( `finish` >= '%s' OR ( nofinish AND start >= '%s' ) ) AND `start` <= '%s' )
|
AND ((`adjust` = 0 AND (`finish` >= '%s' OR (nofinish AND start >= '%s')) AND `start` <= '%s')
|
||||||
OR ( `adjust` = 1 AND ( `finish` >= '%s' OR ( nofinish AND start >= '%s' ) ) AND `start` <= '%s' )) ",
|
OR (`adjust` = 1 AND (`finish` >= '%s' OR (nofinish AND start >= '%s')) AND `start` <= '%s')) ",
|
||||||
intval(local_user()),
|
intval(local_user()),
|
||||||
intval($ignored),
|
intval($ignored),
|
||||||
dbesc($start),
|
dbesc($start),
|
||||||
|
@ -469,7 +471,7 @@ function events_content(&$a) {
|
||||||
|
|
||||||
require_once('include/acl_selectors.php');
|
require_once('include/acl_selectors.php');
|
||||||
|
|
||||||
$tpl = get_markup_template('event_form.tpl');
|
$tpl = get_markup_template('event_form.tpl');
|
||||||
|
|
||||||
$o .= replace_macros($tpl,array(
|
$o .= replace_macros($tpl,array(
|
||||||
'$post' => $a->get_baseurl() . '/events',
|
'$post' => $a->get_baseurl() . '/events',
|
||||||
|
@ -495,7 +497,7 @@ function events_content(&$a) {
|
||||||
'$t_orig' => $t_orig,
|
'$t_orig' => $t_orig,
|
||||||
'$sh_text' => t('Share this event'),
|
'$sh_text' => t('Share this event'),
|
||||||
'$sh_checked' => $sh_checked,
|
'$sh_checked' => $sh_checked,
|
||||||
'$preview' => t('Preview'),
|
'$preview' => t('Preview'),
|
||||||
'$acl' => (($cid) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $a->user),false)),
|
'$acl' => (($cid) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $a->user),false)),
|
||||||
'$submit' => t('Submit')
|
'$submit' => t('Submit')
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue