]> git.mxchange.org Git - friendica-addons.git/blobdiff - dav/friendica/main.php
Update t() calls
[friendica-addons.git] / dav / friendica / main.php
index 712b6c7b84da57ba8ffa9ba5c29ee505c69a2138..2534ce9c104cc4451f9c069cf3b2c6b9ac8e9745 100644 (file)
@@ -1,22 +1,27 @@
 <?php
 
+use Friendica\Core\Addon;
+use Friendica\Core\L10n;
+use Friendica\Module\Login;
+use Friendica\Util\Emailer;
+
 require_once('include/security.php');
 
 function dav_install()
 {
-       register_hook('event_created', 'addon/dav/dav.php', 'dav_event_created_hook');
-       register_hook('event_updated', 'addon/dav/dav.php', 'dav_event_updated_hook');
-       register_hook('profile_tabs', 'addon/dav/dav.php', 'dav_profile_tabs_hook');
-       register_hook('cron', 'addon/dav/dav.php', 'dav_cron');
+       Addon::registerHook('event_created', 'addon/dav/dav.php', 'dav_event_created_hook');
+       Addon::registerHook('event_updated', 'addon/dav/dav.php', 'dav_event_updated_hook');
+       Addon::registerHook('profile_tabs', 'addon/dav/dav.php', 'dav_profile_tabs_hook');
+       Addon::registerHook('cron', 'addon/dav/dav.php', 'dav_cron');
 }
 
 
 function dav_uninstall()
 {
-       unregister_hook('event_created', 'addon/dav/dav.php', 'dav_event_created_hook');
-       unregister_hook('event_updated', 'addon/dav/dav.php', 'dav_event_updated_hook');
-       unregister_hook('profile_tabs', 'addon/dav/dav.php', 'dav_profile_tabs_hook');
-       unregister_hook('cron', 'addon/dav/dav.php', 'dav_cron');
+       Addon::unregisterHook('event_created', 'addon/dav/dav.php', 'dav_event_created_hook');
+       Addon::unregisterHook('event_updated', 'addon/dav/dav.php', 'dav_event_updated_hook');
+       Addon::unregisterHook('profile_tabs', 'addon/dav/dav.php', 'dav_profile_tabs_hook');
+       Addon::unregisterHook('cron', 'addon/dav/dav.php', 'dav_cron');
 }
 
 
@@ -147,7 +152,7 @@ function dav_content()
 {
        $a = get_app();
        if (!isset($a->user["uid"]) || $a->user["uid"] == 0) {
-               return login();
+               return Login::form();
        }
 
        $x = "";
@@ -159,11 +164,11 @@ 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"]);
-                                               goaway($a->get_baseurl() . "/dav/wdcal/");
+                                               goaway('dav/wdcal/');
                                        }
                                        $o .= wdcal_getNewPage();
                                        return $o;
@@ -177,11 +182,11 @@ 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"]);
-                                                               goaway($a->get_baseurl() . "/dav/wdcal/");
+                                                               goaway('dav/wdcal/');
                                                        }
                                                        $o .= wdcal_getEditPage($calendar_id, $a->argv[3]);
                                                        return $o;
@@ -195,11 +200,11 @@ function dav_content()
                        } else {
                                $server = dav_create_server(true, true, false);
                                $cals   = dav_get_current_user_calendars($server, DAV_ACL_READ);
-                               $x      = wdcal_printCalendar($cals, array(), $a->get_baseurl() . "/dav/wdcal/feed/", "week", 0, 200);
+                               $x      = wdcal_printCalendar($cals, [], $a->get_baseurl() . "/dav/wdcal/feed/", "week", 0, 200);
                        }
                }
        } catch (DAVVersionMismatchException $e) {
-               $x = t("The current version of this plugin has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this.");
+               $x = L10n::t("The current version of this addon has not been set up correctly. Please contact the system administrator of your installation of friendica to fix this.");
        }
        return $x;
 }
@@ -235,12 +240,12 @@ function dav_event_updated_hook(&$a, &$b)
  */
 function dav_profile_tabs_hook(&$a, &$b)
 {
-       $b["tabs"][] = array(
-               "label" => t('Calendar'),
+       $b["tabs"][] = [
+               "label" => L10n::t('Calendar'),
                "url"   => $a->get_baseurl() . "/dav/wdcal/",
                "sel"   => "",
-               "title" => t('Extended calendar with CalDAV-support'),
-       );
+               "title" => L10n::t('Extended calendar with CalDAV-support'),
+       ];
 }
 
 
@@ -253,11 +258,12 @@ 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"]);
                $calendar = q("SELECT * FROM %s%scalendars WHERE `id` = %d", CALDAV_SQL_DB, CALDAV_SQL_PREFIX, $not["calendar_id"]);
-               $users    = array();
+               $users    = [];
                if (count($calendar) != 1 || count($event) == 0) continue;
                switch ($calendar[0]["namespace"]) {
                        case CALDAV_NAMESPACE_PRIVATE:
@@ -270,26 +276,26 @@ function dav_cron(&$a, &$b)
                        case "email":
                        case "display": // @TODO implement "Display"
                                foreach ($users as $user) {
-                                       $find      = array("%to%", "%event%", "%url%");
-                                       $repl      = array($user["username"], $event[0]["Summary"], $a->get_baseurl() . "/dav/wdcal/" . $calendar[0]["id"] . "/" . $not["calendarobject_id"] . "/");
+                                       $find      = ["%to%", "%event%", "%url%"];
+                                       $repl      = [$user["username"], $event[0]["Summary"], $a->get_baseurl() . "/dav/wdcal/" . $calendar[0]["id"] . "/" . $not["calendarobject_id"] . "/"];
                                        $text_text = str_replace($find, $repl, "Hi %to%!\n\nThe event \"%event%\" is about to begin:\n%url%");
                                        $text_html = str_replace($find, $repl, "Hi %to%!<br>\n<br>\nThe event \"%event%\" is about to begin:<br>\n<a href='" . "%url%" . "'>%url%</a>");
-                                       $params    = array(
+                                       $params    = [
                                                'fromName'             => FRIENDICA_PLATFORM,
-                                               'fromEmail'            => t('noreply') . '@' . $a->get_hostname(),
-                                               'replyTo'              => t('noreply') . '@' . $a->get_hostname(),
+                                               'fromEmail'            => L10n::t('noreply') . '@' . $a->get_hostname(),
+                                               'replyTo'              => L10n::t('noreply') . '@' . $a->get_hostname(),
                                                'toEmail'              => $user["email"],
-                                               'messageSubject'       => t("Notification: " . $event[0]["Summary"]),
+                                               'messageSubject'       => L10n::t("Notification: " . $event[0]["Summary"]),
                                                'htmlVersion'          => $text_html,
                                                'textVersion'          => $text_text,
                                                'additionalMailHeader' => "",
-                                       );
-                                       require_once('include/enotify.php');
-                                       enotify::send($params);
+                                       ];
+                                       Emailer::send($params);
                                }
                                break;
                }
        }
+    }
 }
 
 
@@ -297,24 +303,24 @@ function dav_cron(&$a, &$b)
  * @param App $a
  * @param null|object $o
  */
-function dav_plugin_admin_post(&$a = null, &$o = null)
+function dav_addon_admin_post(&$a = null, &$o = null)
 {
-       check_form_security_token_redirectOnErr('/admin/plugins/dav', 'dav_admin_save');
+       check_form_security_token_redirectOnErr('/admin/addons/dav', 'dav_admin_save');
 
        dav_include_files();
        require_once(__DIR__ . "/database-init.inc.php");
 
        if (isset($_REQUEST["install"])) {
                $errs = dav_create_tables();
-               if (count($errs) == 0) info(t('The database tables have been installed.') . EOL);
-               else notice(t("An error occurred during the installation.") . EOL);
+               if (count($errs) == 0) info(L10n::t('The database tables have been installed.') . EOL);
+               else notice(L10n::t("An error occurred during the installation.") . EOL);
        }
        if (isset($_REQUEST["upgrade"])) {
                $errs = dav_upgrade_tables();
                if (count($errs) == 0) {
                        renderAllCalDavEntries();
-                       info(t('The database tables have been updated.') . EOL);
-               } else notice(t("An error occurred during the update.") . EOL);
+                       info(L10n::t('The database tables have been updated.') . EOL);
+               } else notice(L10n::t("An error occurred during the update.") . EOL);
        }
 }
 
@@ -322,7 +328,7 @@ function dav_plugin_admin_post(&$a = null, &$o = null)
  * @param App $a
  * @param string $o
  */
-function dav_plugin_admin(&$a, &$o)
+function dav_addon_admin(&$a, &$o)
 {
        dav_include_files();
        require_once(__DIR__ . "/database-init.inc.php");
@@ -330,33 +336,34 @@ function dav_plugin_admin(&$a, &$o)
        $dbstatus = dav_check_tables();
 
        $o = '<input type="hidden" name="form_security_token" value="' . get_form_security_token("dav_admin_save") . '">';
-       $o .= '<i>' . t("No system-wide settings yet.") . '</i><br><br>';
+       $o .= '<i>' . L10n::t("No system-wide settings yet.") . '</i><br><br>';
 
 
-       $o .= '<h3>' . t('Database status') . '</h3>';
+       $o .= '<h3>' . L10n::t('Database status') . '</h3>';
        switch ($dbstatus) {
                case 0:
-                       $o .= t('Installed');
+                       $o .= L10n::t('Installed');
                        break;
                case 1:
-                       $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') . "'>";
+               case 2:
+                       $o .= "<strong>" . L10n::t('Upgrade needed') . "</strong><br>" . L10n::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='" . L10n::t('Upgrade') . "'>";
                        break;
                case -1:
-                       $o .= t('Not installed') . "<br><br><input type='submit' name='install' value='" . t('Install') . "'>";
+                       $o .= L10n::t('Not installed') . "<br><br><input type='submit' name='install' value='" . L10n::t('Install') . "'>";
                        break;
                case -2:
                default:
-                       $o .= t('Unknown') . "<br><br>" . t("Something really went wrong. I cannot recover from this state automatically, sorry. Please go to the database backend, back up the data, and delete all tables beginning with 'dav_' manually. Afterwards, this installation routine should be able to reinitialize the tables automatically.");
+                       $o .= L10n::t('Unknown') . "<br><br>" . L10n::t("Something really went wrong. I cannot recover from this state automatically, sorry. Please go to the database backend, back up the data, and delete all tables beginning with 'dav_' manually. Afterwards, this installation routine should be able to reinitialize the tables automatically.");
                        break;
        }
        $o .= "<br><br>";
 
-       $o .= "<h3>" . t("Troubleshooting") . "</h3>";
-       $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>";
+       $o .= "<h3>" . L10n::t("Troubleshooting") . "</h3>";
+       $o .= "<h4>" . L10n::t("Manual creation of the database tables:") . "</h4>";
+       $o .= "<a href='#' onClick='\$(\"#sqlstatements\").show(); return false;'>" . L10n::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: