X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fevent.php;h=64b1ebddc3c4a4008ce11e2f4c82c5050063622a;hb=8d469c155a3c0e8c9665546ab5bc5ab091a970b5;hp=c4111dc0b174869be3fff15d6b58599a10d06bcd;hpb=8395f67351b3ac2b3739a99967ba58bf8e731051;p=friendica.git
diff --git a/include/event.php b/include/event.php
index c4111dc0b1..64b1ebddc3 100644
--- a/include/event.php
+++ b/include/event.php
@@ -1,39 +1,45 @@
".bbcode($ev['summary'])."";
+ $o = "
" . bbcode($ev['desc']) . "
";
- $o .= "" . $event_start . "
";
- if(! $ev['nofinish'])
- $o .= "" . $event_end ."
";
+ }
- if(strlen($ev['location']))
- $o .= "" . $ev['location'] . "
";
+ }
return $o;
}
@@ -41,31 +47,34 @@ function format_event_html($ev, $simple = false) {
$o = '' . "\r\n";
- $o .= '
' . bbcode($ev['summary']) . '
' . "\r\n";
+ $o .= '
' . bbcode($ev['summary']) . '
' . "\r\n";
- $o .= '
' . bbcode($ev['desc']) . '
' . "\r\n";
+ $o .= '
' . bbcode($ev['desc']) . '
' . "\r\n";
$o .= '
' . t('Starts:') . ' '.$event_start
. '
' . "\r\n";
- if(! $ev['nofinish'])
+ if (! $ev['nofinish']) {
$o .= '
' . t('Finishes:') . ' '.$event_end
- . '
' . "\r\n";
+ . '' . "\r\n";
+ }
- if(strlen($ev['location'])){
+ if (strlen($ev['location'])) {
$o .= '
' . t('Location:') . ' '
. bbcode($ev['location'])
. '
' . "\r\n";
- if (strpos($ev['location'], "[map")===False) {
+ // Include a map of the location if the [map] BBCode is used
+ if (strpos($ev['location'], "[map") !== false) {
$map = generate_named_map($ev['location']);
- if ($map!==$ev['location']) $o.=$map;
+ if ($map !== $ev['location']) {
+ $o.= $map;
+ }
}
-
}
$o .= '
' . "\r\n";
@@ -73,10 +82,10 @@ function format_event_html($ev, $simple = false) {
}
/*
+@TODO old-lost code found?
function parse_event($h) {
require_once('include/Scrape.php');
- require_once('library/HTMLPurifier.auto.php');
require_once('include/html2bbcode');
$h = '' . $h . '';
@@ -90,26 +99,26 @@ function parse_event($h) {
logger('parse_event: parse error: ' . $e);
}
- if(! $dom)
+ if (! $dom)
return $ret;
$items = $dom->getElementsByTagName('*');
- foreach($items as $item) {
- if(attribute_contains($item->getAttribute('class'), 'vevent')) {
+ foreach ($items as $item) {
+ if (attribute_contains($item->getAttribute('class'), 'vevent')) {
$level2 = $item->getElementsByTagName('*');
- foreach($level2 as $x) {
- if(attribute_contains($x->getAttribute('class'),'dtstart') && $x->getAttribute('title')) {
+ foreach ($level2 as $x) {
+ if (attribute_contains($x->getAttribute('class'),'dtstart') && $x->getAttribute('title')) {
$ret['start'] = $x->getAttribute('title');
- if(! strpos($ret['start'],'Z'))
+ if (! strpos($ret['start'],'Z'))
$ret['adjust'] = true;
}
- if(attribute_contains($x->getAttribute('class'),'dtend') && $x->getAttribute('title'))
+ if (attribute_contains($x->getAttribute('class'),'dtend') && $x->getAttribute('title'))
$ret['finish'] = $x->getAttribute('title');
- if(attribute_contains($x->getAttribute('class'),'description'))
+ if (attribute_contains($x->getAttribute('class'),'description'))
$ret['desc'] = $x->textContent;
- if(attribute_contains($x->getAttribute('class'),'location'))
+ if (attribute_contains($x->getAttribute('class'),'location'))
$ret['location'] = $x->textContent;
}
}
@@ -117,23 +126,23 @@ function parse_event($h) {
// sanitise
- if((x($ret,'desc')) && ((strpos($ret['desc'],'<') !== false) || (strpos($ret['desc'],'>') !== false))) {
+ if ((x($ret,'desc')) && ((strpos($ret['desc'],'<') !== false) || (strpos($ret['desc'],'>') !== false))) {
$config = HTMLPurifier_Config::createDefault();
$config->set('Cache.DefinitionImpl', null);
$purifier = new HTMLPurifier($config);
$ret['desc'] = html2bbcode($purifier->purify($ret['desc']));
}
- if((x($ret,'location')) && ((strpos($ret['location'],'<') !== false) || (strpos($ret['location'],'>') !== false))) {
+ if ((x($ret,'location')) && ((strpos($ret['location'],'<') !== false) || (strpos($ret['location'],'>') !== false))) {
$config = HTMLPurifier_Config::createDefault();
$config->set('Cache.DefinitionImpl', null);
$purifier = new HTMLPurifier($config);
$ret['location'] = html2bbcode($purifier->purify($ret['location']));
}
- if(x($ret,'start'))
+ if (x($ret,'start'))
$ret['start'] = datetime_convert('UTC','UTC',$ret['start']);
- if(x($ret,'finish'))
+ if (x($ret,'finish'))
$ret['finish'] = datetime_convert('UTC','UTC',$ret['finish']);
return $ret;
@@ -144,63 +153,81 @@ function format_event_bbcode($ev) {
$o = '';
- if($ev['summary'])
+ if ($ev['summary']) {
$o .= '[event-summary]' . $ev['summary'] . '[/event-summary]';
+ }
- if($ev['desc'])
+ if ($ev['desc']) {
$o .= '[event-description]' . $ev['desc'] . '[/event-description]';
+ }
- if($ev['start'])
+ if ($ev['start']) {
$o .= '[event-start]' . $ev['start'] . '[/event-start]';
+ }
- if(($ev['finish']) && (! $ev['nofinish']))
+ if (($ev['finish']) && (! $ev['nofinish'])) {
$o .= '[event-finish]' . $ev['finish'] . '[/event-finish]';
+ }
- if($ev['location'])
+ if ($ev['location']) {
$o .= '[event-location]' . $ev['location'] . '[/event-location]';
+ }
- if($ev['adjust'])
+ if ($ev['adjust']) {
$o .= '[event-adjust]' . $ev['adjust'] . '[/event-adjust]';
-
+ }
return $o;
-
}
function bbtovcal($s) {
$o = '';
$ev = bbtoevent($s);
- if($ev['desc'])
+
+ if ($ev['desc']) {
$o = format_event_html($ev);
+ }
+
return $o;
}
-
function bbtoevent($s) {
$ev = array();
$match = '';
- if(preg_match("/\[event\-summary\](.*?)\[\/event\-summary\]/is",$s,$match))
+ if (preg_match("/\[event\-summary\](.*?)\[\/event\-summary\]/is", $s, $match)) {
$ev['summary'] = $match[1];
+ }
+
$match = '';
- if(preg_match("/\[event\-description\](.*?)\[\/event\-description\]/is",$s,$match))
+ if (preg_match("/\[event\-description\](.*?)\[\/event\-description\]/is", $s, $match)) {
$ev['desc'] = $match[1];
+ }
+
$match = '';
- if(preg_match("/\[event\-start\](.*?)\[\/event\-start\]/is",$s,$match))
+ if (preg_match("/\[event\-start\](.*?)\[\/event\-start\]/is", $s, $match)) {
$ev['start'] = $match[1];
+ }
+
$match = '';
- if(preg_match("/\[event\-finish\](.*?)\[\/event\-finish\]/is",$s,$match))
+ if (preg_match("/\[event\-finish\](.*?)\[\/event\-finish\]/is", $s, $match)) {
$ev['finish'] = $match[1];
+ }
+
$match = '';
- if(preg_match("/\[event\-location\](.*?)\[\/event\-location\]/is",$s,$match))
+ if (preg_match("/\[event\-location\](.*?)\[\/event\-location\]/is", $s, $match)) {
$ev['location'] = $match[1];
+ }
+
$match = '';
- if(preg_match("/\[event\-adjust\](.*?)\[\/event\-adjust\]/is",$s,$match))
+ if (preg_match("/\[event\-adjust\](.*?)\[\/event\-adjust\]/is", $s, $match)) {
$ev['adjust'] = $match[1];
+ }
+
$ev['nofinish'] = (((x($ev, 'start') && $ev['start']) && (!x($ev, 'finish') || !$ev['finish'])) ? 1 : 0);
- return $ev;
+ return $ev;
}
@@ -210,21 +237,22 @@ function sort_by_date($a) {
return $a;
}
-
function ev_compare($a,$b) {
- $date_a = (($a['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$a['start']) : $a['start']);
- $date_b = (($b['adjust']) ? datetime_convert('UTC',date_default_timezone_get(),$b['start']) : $b['start']);
+ $date_a = (($a['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $a['start']) : $a['start']);
+ $date_b = (($b['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $b['start']) : $b['start']);
- if($date_a === $date_b)
- return strcasecmp($a['desc'],$b['desc']);
+ if ($date_a === $date_b) {
+ return strcasecmp($a['desc'], $b['desc']);
+ }
- return strcmp($date_a,$date_b);
+ return strcmp($date_a, $date_b);
}
function event_delete($event_id) {
- if ($event_id == 0)
+ if ($event_id == 0) {
return;
+ }
q("DELETE FROM `event` WHERE `id` = %d", intval($event_id));
logger("Deleted event ".$event_id, LOGGER_DEBUG);
@@ -232,36 +260,39 @@ function event_delete($event_id) {
function event_store($arr) {
- require_once('include/datetime.php');
- require_once('include/items.php');
- require_once('include/bbcode.php');
+ 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']));
- $arr['private'] = ((x($arr,'private')) ? intval($arr['private']) : 0);
+ $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']));
+ $arr['private'] = ((x($arr, 'private')) ? intval($arr['private']) : 0);
+ $arr['guid'] = get_guid(32);
- if($arr['cid'])
+ if ($arr['cid']) {
$c = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($arr['cid']),
intval($arr['uid'])
);
- else
+ } else {
$c = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
intval($arr['uid'])
);
+ }
- if(count($c))
+ if (dbm::is_result($c)) {
$contact = $c[0];
+ }
// Existing event being modified
- if($arr['id']) {
+ if ($arr['id']) {
// has the event actually changed?
@@ -269,7 +300,7 @@ function event_store($arr) {
intval($arr['id']),
intval($arr['uid'])
);
- if((! count($r)) || ($r[0]['edited'] === $arr['edited'])) {
+ if ((! dbm::is_result($r)) || ($r[0]['edited'] === $arr['edited'])) {
// Nothing has changed. Grab the item id to return.
@@ -277,7 +308,7 @@ function event_store($arr) {
intval($arr['id']),
intval($arr['uid'])
);
- return((count($r)) ? $r[0]['id'] : 0);
+ return ((dbm::is_result($r)) ? $r[0]['id'] : 0);
}
// The event changed. Update it.
@@ -291,11 +322,7 @@ function event_store($arr) {
`location` = '%s',
`type` = '%s',
`adjust` = %d,
- `nofinish` = %d,
- `allow_cid` = '%s',
- `allow_gid` = '%s',
- `deny_cid` = '%s',
- `deny_gid` = '%s'
+ `nofinish` = %d
WHERE `id` = %d AND `uid` = %d",
dbesc($arr['edited']),
@@ -307,10 +334,6 @@ function event_store($arr) {
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'])
);
@@ -318,43 +341,37 @@ function event_store($arr) {
intval($arr['id']),
intval($arr['uid'])
);
- if(count($r)) {
+ if (dbm::is_result($r)) {
$object = '