X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=dav%2Ffriendica%2Fmain.php;h=2534ce9c104cc4451f9c069cf3b2c6b9ac8e9745;hb=a4a89c7f5ff07c18b059c145f06c77299e7ec280;hp=1b9fff86f95b9d691bb516181494adcdff7a8fba;hpb=0f430ccb42b11dcc98c98bac6eb4127140b2f58b;p=friendica-addons.git
diff --git a/dav/friendica/main.php b/dav/friendica/main.php
index 1b9fff86..2534ce9c 100644
--- a/dav/friendica/main.php
+++ b/dav/friendica/main.php
@@ -1,22 +1,27 @@
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'),
+ ];
}
@@ -258,7 +263,7 @@ function dav_cron(&$a, &$b)
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:
@@ -271,21 +276,20 @@ 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%!
\n
\nThe event \"%event%\" is about to begin:
\n%url%");
- $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/Emailer.php');
+ ];
Emailer::send($params);
}
break;
@@ -299,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);
}
}
@@ -324,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");
@@ -332,31 +336,31 @@ function dav_plugin_admin(&$a, &$o)
$dbstatus = dav_check_tables();
$o = '';
- $o .= '' . t("No system-wide settings yet.") . '
';
+ $o .= '' . L10n::t("No system-wide settings yet.") . '
';
- $o .= '