Addons hadn't been changed for the moved emailer class

[friendica-addons.git] / dav / friendica / main.php

diff --git a/dav/friendica/main.php b/dav/friendica/main.php
index 602bda6d77e7dfbfa5cc77be3e99dace13429d01..006dce957f1212f9c97b39a46cd53e583cf0ebb0 100644 (file)
--- a/dav/friendica/main.php
+++ b/dav/friendica/main.php
@@ -1,4 +1,5 @@
 <?php
+use Friendica\Util\Emailer;
 
 require_once('include/security.php');
 
@@ -28,6 +29,27 @@ function dav_include_files()
 {
        require_once (__DIR__ . "/../SabreDAV/lib/Sabre/autoload.php");
 
+       require_once (__DIR__ . "/../sabre-vobject/lib/Sabre/VObject/Node.php");
+       require_once (__DIR__ . "/../sabre-vobject/lib/Sabre/VObject/Element.php");
+       require_once (__DIR__ . "/../sabre-vobject/lib/Sabre/VObject/Component.php");
+       require_once (__DIR__ . "/../sabre-vobject/lib/Sabre/VObject/DateTimeParser.php");
+       require_once (__DIR__ . "/../sabre-vobject/lib/Sabre/VObject/ElementList.php");
+       require_once (__DIR__ . "/../sabre-vobject/lib/Sabre/VObject/FreeBusyGenerator.php");
+       require_once (__DIR__ . "/../sabre-vobject/lib/Sabre/VObject/Parameter.php");
+       require_once (__DIR__ . "/../sabre-vobject/lib/Sabre/VObject/ParseException.php");
+       require_once (__DIR__ . "/../sabre-vobject/lib/Sabre/VObject/Property.php");
+       require_once (__DIR__ . "/../sabre-vobject/lib/Sabre/VObject/Reader.php");
+       require_once (__DIR__ . "/../sabre-vobject/lib/Sabre/VObject/RecurrenceIterator.php");
+       require_once (__DIR__ . "/../sabre-vobject/lib/Sabre/VObject/TimeZoneUtil.php");
+       require_once (__DIR__ . "/../sabre-vobject/lib/Sabre/VObject/Version.php");
+       require_once (__DIR__ . "/../sabre-vobject/lib/Sabre/VObject/Property/DateTime.php");
+       require_once (__DIR__ . "/../sabre-vobject/lib/Sabre/VObject/Property/MultiDateTime.php");
+       require_once (__DIR__ . "/../sabre-vobject/lib/Sabre/VObject/Component/VAlarm.php");
+       require_once (__DIR__ . "/../sabre-vobject/lib/Sabre/VObject/Component/VCalendar.php");
+       require_once (__DIR__ . "/../sabre-vobject/lib/Sabre/VObject/Component/VEvent.php");
+       require_once (__DIR__ . "/../sabre-vobject/lib/Sabre/VObject/Component/VJournal.php");
+       require_once (__DIR__ . "/../sabre-vobject/lib/Sabre/VObject/Component/VTodo.php");
+
        require_once (__DIR__ . "/../common/calendar.fnk.php");
        require_once (__DIR__ . "/../common/calendar_rendering.fnk.php");
 
@@ -109,7 +131,7 @@ function dav_init(&$a)
        }
 
 
-       $server  = dav_create_server();
+       $server = dav_create_server();
 
        $browser = new Sabre_DAV_Browser_Plugin();
        $server->addPlugin($browser);
@@ -138,7 +160,7 @@ function dav_content()
                                if ($a->argv[2] == "new") {
                                        $o = "";
                                        if (isset($_REQUEST["save"])) {
-                                               check_form_security_token_redirectOnErr($a->get_baseurl() . "/dav/wdcal/", "caledit");
+                                               check_form_security_token_redirectOnErr("/dav/wdcal/", "caledit");
                                                $ret = wdcal_postEditPage("new", "", $a->user["uid"], $a->timezone, $a->get_baseurl() . "/dav/wdcal/");
                                                if ($ret["ok"]) notice($ret["msg"]);
                                                else info($ret["msg"]);
@@ -156,7 +178,7 @@ function dav_content()
                                                if (isset($a->argv[4]) && $a->argv[4] == "edit") {
                                                        $o = "";
                                                        if (isset($_REQUEST["save"])) {
-                                                               check_form_security_token_redirectOnErr($a->get_baseurl() . "/dav/wdcal/", "caledit");
+                                                               check_form_security_token_redirectOnErr("/dav/wdcal/", "caledit");
                                                                $ret = wdcal_postEditPage($a->argv[3], $a->user["uid"], $a->timezone, $a->get_baseurl() . "/dav/wdcal/");
                                                                if ($ret["ok"]) notice($ret["msg"]);
                                                                else info($ret["msg"]);
@@ -232,6 +254,7 @@ function dav_cron(&$a, &$b)
        dav_include_files();
 
        $r = q("SELECT * FROM %s%snotifications WHERE `notified` = 0 AND `alert_date` <= NOW()", CALDAV_SQL_DB, CALDAV_SQL_PREFIX);
+    if (is_array($r)) {
        foreach ($r as $not) {
                q("UPDATE %s%snotifications SET `notified` = 1 WHERE `id` = %d", CALDAV_SQL_DB, CALDAV_SQL_PREFIX, $not["id"]);
                $event    = q("SELECT * FROM %s%sjqcalendar WHERE `calendarobject_id` = %d", CALDAV_SQL_DB, CALDAV_SQL_PREFIX, $not["calendarobject_id"]);
@@ -263,12 +286,12 @@ function dav_cron(&$a, &$b)
                                                'textVersion'          => $text_text,
                                                'additionalMailHeader' => "",
                                        );
-                                       require_once('include/enotify.php');
-                                       enotify::send($params);
+                                       Emailer::send($params);
                                }
                                break;
                }
        }
+    }
 }
 
 
@@ -293,8 +316,7 @@ function dav_plugin_admin_post(&$a = null, &$o = null)
                if (count($errs) == 0) {
                        renderAllCalDavEntries();
                        info(t('The database tables have been updated.') . EOL);
-               }
-               else notice(t("An error occurred during the update.") . EOL);
+               } else notice(t("An error occurred during the update.") . EOL);
        }
 }
 
@@ -319,6 +341,7 @@ function dav_plugin_admin(&$a, &$o)
                        $o .= t('Installed');
                        break;
                case 1:
+               case 2:
                        $o .= "<strong>" . t('Upgrade needed') . "</strong><br>" . t("Please back up all calendar data (the tables beginning with dav_*) before proceeding. While all calendar events <i>should</i> be converted to the new database structure, it's always safe to have a backup. Below, you can have a look at the database-queries that will be made when pressing the 'update'-button.") . "<br><br><input type='submit' name='upgrade' value='" . t('Upgrade') . "'>";
                        break;
                case -1:
@@ -335,8 +358,8 @@ function dav_plugin_admin(&$a, &$o)
        $o .= "<h4>" . t("Manual creation of the database tables:") . "</h4>";
        $o .= "<a href='#' onClick='\$(\"#sqlstatements\").show(); return false;'>" . t("Show SQL-statements") . "</a><blockquote style='display: none;' id='sqlstatements'><pre>";
        switch ($dbstatus) {
-               case 1:
-                       $tables = dav_get_update_statements(1);
+               case 1: case 2:
+                       $tables = dav_get_update_statements($dbstatus);
                        foreach ($tables as $t) $o .= escape_tags($t . ";\n\n");
                        break;
                default: