It is better this way

[friendica.git] / include / event.php
diff --git a/include/event.php b/include/event.php

index ebd4885c91d3ee67809906fccaa0650d6ce79f98..089fe705dbbe1b10a6ee68f7e22e01d00787e82c 100644 (file)
--- a/include/event.php
+++ b/include/event.php
@@ -4,13 +4,15 @@
   * @brief functions specific to event handling
   */
  
+use Friendica\App;
+
  require_once 'include/bbcode.php';
  require_once 'include/map.php';
  require_once 'include/datetime.php';
  
  function format_event_html($ev, $simple = false) {
  
-       if(! ((is_array($ev)) && count($ev))) {
+       if (! ((is_array($ev)) && count($ev))) {
                 return '';
         }
  
@@ -81,73 +83,6 @@ function format_event_html($ev, $simple = false) {
         return $o;
  }
  
-/*
-function parse_event($h) {
-
-       require_once('include/Scrape.php');
-       require_once('include/html2bbcode');
-
-       $h = '<html><body>' . $h . '</body></html>';
-
-       $ret = array();
-
-
-       try {
-               $dom = HTML5_Parser::parse($h);
-       } catch (DOMException $e) {
-               logger('parse_event: parse error: ' . $e);
-       }
-
-       if(! $dom)
-               return $ret;
-
-       $items = $dom->getElementsByTagName('*');
-
-       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')) {
-                                       $ret['start'] = $x->getAttribute('title');
-                                       if(! strpos($ret['start'],'Z'))
-                                               $ret['adjust'] = true;
-                               }
-                               if(attribute_contains($x->getAttribute('class'),'dtend') && $x->getAttribute('title'))
-                                       $ret['finish'] = $x->getAttribute('title');
-
-                               if(attribute_contains($x->getAttribute('class'),'description'))
-                                       $ret['desc'] = $x->textContent;
-                               if(attribute_contains($x->getAttribute('class'),'location'))
-                                       $ret['location'] = $x->textContent;
-                       }
-               }
-       }
-
-       // sanitise
-
-       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))) {
-               $config = HTMLPurifier_Config::createDefault();
-               $config->set('Cache.DefinitionImpl', null);
-               $purifier = new HTMLPurifier($config);
-               $ret['location'] = html2bbcode($purifier->purify($ret['location']));
-       }
-
-       if(x($ret,'start'))
-               $ret['start'] = datetime_convert('UTC','UTC',$ret['start']);
-       if(x($ret,'finish'))
-               $ret['finish'] = datetime_convert('UTC','UTC',$ret['finish']);
-
-       return $ret;
-}
-*/
-
  function format_event_bbcode($ev) {
  
         $o = '';
@@ -534,7 +469,7 @@ function get_event_strings() {
   *
   * @param array $dates Array of possibly duplicated events
   * @return array Cleaned events
- * 
+ *
   * @todo We should replace this with a separate update function if there is some time left
   */
  function event_remove_duplicates($dates) {
@@ -595,7 +530,7 @@ function event_by_id($owner_uid = 0, $event_params, $sql_extra = '') {
   */
  function events_by_date($owner_uid = 0, $event_params, $sql_extra = '') {
         // Only allow events if there is a valid owner_id
-       if($owner_uid == 0) {
+       if ($owner_uid == 0) {
                 return;
         }