aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2019-07-28 20:00:14 -0700
committerzotlabs <mike@macgirvin.com>2019-07-28 20:00:14 -0700
commit70e4a2c4fa69135dea97d1b6323fe6f8e17961c7 (patch)
tree38e8f097ec0d9aecb12dcce0bfcf239af37cebbf /Zotlabs/Module
parent696359daba11c51d8f733dfa173e48b5e1de69ef (diff)
parent5695350e98a8a2c802ff419c5b29b0f01f0180df (diff)
downloadvolse-hubzilla-70e4a2c4fa69135dea97d1b6323fe6f8e17961c7.tar.gz
volse-hubzilla-70e4a2c4fa69135dea97d1b6323fe6f8e17961c7.tar.bz2
volse-hubzilla-70e4a2c4fa69135dea97d1b6323fe6f8e17961c7.zip
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'Zotlabs/Module')
-rw-r--r--Zotlabs/Module/Apschema.php6
-rw-r--r--Zotlabs/Module/Cdav.php12
-rw-r--r--Zotlabs/Module/Channel_calendar.php6
-rw-r--r--Zotlabs/Module/Dirsearch.php2
-rw-r--r--Zotlabs/Module/Photo.php2
-rw-r--r--Zotlabs/Module/Share.php2
6 files changed, 16 insertions, 14 deletions
diff --git a/Zotlabs/Module/Apschema.php b/Zotlabs/Module/Apschema.php
index 12cc0e00a..756057a8a 100644
--- a/Zotlabs/Module/Apschema.php
+++ b/Zotlabs/Module/Apschema.php
@@ -44,7 +44,9 @@ class Apschema extends \Zotlabs\Web\Controller {
'conversation' => 'ostatus:conversation',
'diaspora' => 'https://diasporafoundation.org/ns/',
- 'guid' => 'diaspora:guid'
+ 'guid' => 'diaspora:guid',
+
+ 'Hashtag' => 'as:Hashtag'
]
];
@@ -58,4 +60,4 @@ class Apschema extends \Zotlabs\Web\Controller {
-} \ No newline at end of file
+}
diff --git a/Zotlabs/Module/Cdav.php b/Zotlabs/Module/Cdav.php
index b199019c1..e2855d2b6 100644
--- a/Zotlabs/Module/Cdav.php
+++ b/Zotlabs/Module/Cdav.php
@@ -278,11 +278,11 @@ class Cdav extends Controller {
$allday = $_REQUEST['allday'];
$title = $_REQUEST['title'];
- $start = datetime_convert($tz, 'UTC', $_REQUEST['dtstart']);
+ $start = datetime_convert('UTC', 'UTC', $_REQUEST['dtstart']);
$dtstart = new \DateTime($start);
if($_REQUEST['dtend']) {
- $end = datetime_convert($tz, 'UTC', $_REQUEST['dtend']);
+ $end = datetime_convert('UTC', 'UTC', $_REQUEST['dtend']);
$dtend = new \DateTime($end);
}
$description = $_REQUEST['description'];
@@ -369,10 +369,10 @@ class Cdav extends Controller {
$uri = $_REQUEST['uri'];
$title = $_REQUEST['title'];
- $start = datetime_convert($tz, 'UTC', $_REQUEST['dtstart']);
+ $start = datetime_convert('UTC', 'UTC', $_REQUEST['dtstart']);
$dtstart = new \DateTime($start);
if($_REQUEST['dtend']) {
- $end = datetime_convert($tz, 'UTC', $_REQUEST['dtend']);
+ $end = datetime_convert('UTC', 'UTC', $_REQUEST['dtend']);
$dtend = new \DateTime($end);
}
$description = $_REQUEST['description'];
@@ -442,10 +442,10 @@ class Cdav extends Controller {
$allday = $_REQUEST['allday'];
$uri = $_REQUEST['uri'];
- $start = datetime_convert($tz, 'UTC', $_REQUEST['dtstart']);
+ $start = datetime_convert('UTC', 'UTC', $_REQUEST['dtstart']);
$dtstart = new \DateTime($start);
if($_REQUEST['dtend']) {
- $end = datetime_convert($tz, 'UTC', $_REQUEST['dtend']);
+ $end = datetime_convert('UTC', 'UTC', $_REQUEST['dtend']);
$dtend = new \DateTime($end);
}
diff --git a/Zotlabs/Module/Channel_calendar.php b/Zotlabs/Module/Channel_calendar.php
index 109b18f37..7d75a7e41 100644
--- a/Zotlabs/Module/Channel_calendar.php
+++ b/Zotlabs/Module/Channel_calendar.php
@@ -21,7 +21,7 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
$event_hash = ((x($_POST,'event_hash')) ? $_POST['event_hash'] : '');
$xchan = ((x($_POST,'xchan')) ? dbesc($_POST['xchan']) : '');
- $uid = local_channel();
+ $uid = local_channel();
// only allow editing your own events.
if(($xchan) && ($xchan !== get_observer_hash()))
@@ -34,8 +34,8 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
$adjust = intval($_POST['adjust']);
- $start = (($adjust) ? datetime_convert($tz, 'UTC', escape_tags($_REQUEST['dtstart'])) : datetime_convert('UTC', 'UTC', escape_tags($_REQUEST['dtstart'])));
- $finish = (($adjust) ? datetime_convert($tz, 'UTC', escape_tags($_REQUEST['dtend'])) : datetime_convert('UTC', 'UTC', escape_tags($_REQUEST['dtend'])));
+ $start = datetime_convert('UTC', 'UTC', escape_tags($_REQUEST['dtstart']));
+ $finish = datetime_convert('UTC', 'UTC', escape_tags($_REQUEST['dtend']));
$summary = escape_tags(trim($_POST['summary']));
$desc = escape_tags(trim($_POST['desc']));
diff --git a/Zotlabs/Module/Dirsearch.php b/Zotlabs/Module/Dirsearch.php
index 26cb82044..92b33df0c 100644
--- a/Zotlabs/Module/Dirsearch.php
+++ b/Zotlabs/Module/Dirsearch.php
@@ -394,7 +394,7 @@ class Dirsearch extends \Zotlabs\Web\Controller {
$quoted_string = false;
}
else
- $curr['value'] .= ' ' . trim(q);
+ $curr['value'] .= ' ' . trim($q);
}
}
}
diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php
index a53b00282..59dc709e1 100644
--- a/Zotlabs/Module/Photo.php
+++ b/Zotlabs/Module/Photo.php
@@ -222,7 +222,7 @@ class Photo extends \Zotlabs\Web\Controller {
if(! $data)
killme();
- $etag = md5($data . $modified);
+ $etag = '"' . md5($data . $modified) . '"';
if($modified == 0)
$modified = time();
diff --git a/Zotlabs/Module/Share.php b/Zotlabs/Module/Share.php
index 53a06b072..a18a81937 100644
--- a/Zotlabs/Module/Share.php
+++ b/Zotlabs/Module/Share.php
@@ -106,7 +106,7 @@ class Share extends \Zotlabs\Web\Controller {
$arr['owner_xchan'] = $item['author_xchan'];
$arr['obj'] = Activity::encode_item($item);
$arr['obj_type'] = $item['obj_type'];
- $arr['verb'] = 'Announce';
+ $arr['verb'] = ACTIVITY_SHARE;
$post = item_store($arr);