uimport: add register policy and max daily registrations check (issue 508)

[friendica.git] / mod / events.php

diff --git a/mod/events.php b/mod/events.php
index 4a6d3f100e974e5b4ff9bfe73fcf8510bcbb12a3..527e1ec3fdec8e71ff268e07e63539e7543d9f1e 100755 (executable)
--- a/mod/events.php
+++ b/mod/events.php
@@ -120,7 +120,7 @@ function events_post(&$a) {
        $datarray['allow_gid'] = $str_group_allow;
        $datarray['deny_cid'] = $str_contact_deny;
        $datarray['deny_gid'] = $str_group_deny;
-       $datarray['private'] = $private_event;
+       $datarray['private'] = (($private_event) ? 1 : 0);
        $datarray['id'] = $event_id;
        $datarray['created'] = $created;
        $datarray['edited'] = $edited;
@@ -141,10 +141,27 @@ function events_content(&$a) {
                return;
        }
 
+       if(($a->argc > 2) && ($a->argv[1] === 'ignore') && intval($a->argv[2])) {
+               $r = q("update event set ignore = 1 where id = %d and uid = %d limit 1",
+                       intval($a->argv[2]),
+                       intval(local_user())
+               );
+       }
+
+       if(($a->argc > 2) && ($a->argv[1] === 'unignore') && intval($a->argv[2])) {
+               $r = q("update event set ignore = 0 where id = %d and uid = %d limit 1",
+                       intval($a->argv[2]),
+                       intval(local_user())
+               );
+       }
+
 
        $htpl = get_markup_template('event_head.tpl');
        $a->page['htmlhead'] .= replace_macros($htpl,array('$baseurl' => $a->get_baseurl()));
 
+       $etpl = get_markup_template('event_end.tpl');
+       $a->page['end'] .= replace_macros($etpl,array('$baseurl' => $a->get_baseurl()));
+
        $o ="";
        // tabs
        $tabs = profile_tabs($a, True); 
@@ -154,6 +171,7 @@ function events_content(&$a) {
        $mode = 'view';
        $y = 0;
        $m = 0;
+       $ignored = ((x($_REQUEST,'ignored')) ? intval($_REQUEST['ignored']) : 0);
 
        if($a->argc > 1) {
                if($a->argc > 2 && $a->argv[1] == 'event') {
@@ -231,10 +249,11 @@ function events_content(&$a) {
                } else {
                        $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` 
-                               WHERE `event`.`uid` = %d
+                               WHERE `event`.`uid` = %d and event.ignore = %d
                                AND (( `adjust` = 0 AND `finish` >= '%s' AND `start` <= '%s' ) 
                                OR  (  `adjust` = 1 AND `finish` >= '%s' AND `start` <= '%s' )) ",
                                intval(local_user()),
+                               intval($ignored),
                                dbesc($start),
                                dbesc($finish),
                                dbesc($adjust_start),
@@ -280,10 +299,10 @@ function events_content(&$a) {
                                        
                                $last_date = $d;
                                $edit = ((! $rr['cid']) ? array($a->get_baseurl().'/events/event/'.$rr['id'],t('Edit event'),'','') : null);
-                               $title = strip_tags(bbcode($rr['summary']));
+                               $title = strip_tags(html_entity_decode(bbcode($rr['summary']),ENT_QUOTES,'UTF-8'));
                                if(! $title) {
                                        list($title, $_trash) = explode("<br",bbcode($rr['desc']),2);
-                                       $title = strip_tags($title);
+                                       $title = strip_tags(html_entity_decode($title,ENT_QUOTES,'UTF-8'));
                                }
                                $html = format_event_html($rr);
                                $rr['desc'] = bbcode($rr['desc']);