aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Zotlabs/Daemon/Cron.php3
-rwxr-xr-xutil/zotsh/zotsh.py4
2 files changed, 3 insertions, 4 deletions
diff --git a/Zotlabs/Daemon/Cron.php b/Zotlabs/Daemon/Cron.php
index c66b62f55..ec974ad61 100644
--- a/Zotlabs/Daemon/Cron.php
+++ b/Zotlabs/Daemon/Cron.php
@@ -50,9 +50,8 @@ class Cron {
// expire any expired items
- $r = q("select id from item where expires != '%s' and expires < %s
+ $r = q("select id from item where expires > '2001-01-01 00:00:00' and expires < %s
and item_deleted = 0 ",
- dbesc(NULL_DATE),
db_utcnow()
);
if($r) {
diff --git a/util/zotsh/zotsh.py b/util/zotsh/zotsh.py
index 36506b39d..d5e1aa527 100755
--- a/util/zotsh/zotsh.py
+++ b/util/zotsh/zotsh.py
@@ -55,7 +55,7 @@ class ZotSH(object):
@session.setter
def session(self, session):
self._session = session
- self.davclient = easywebdav.connect( self.hostname, protocol='https', session=session, path="cloud", verify_ssl=VERIFY_SSL)
+ self.davclient = easywebdav.connect( self.hostname, protocol='https', session=session, path="dav", verify_ssl=VERIFY_SSL)
@property
def PS1(self):
@@ -205,7 +205,7 @@ class ZotSH(object):
print _fmt('d', 0, "../")
for f in r:
- name = f.name.replace("/cloud"+self.davclient.cwd,"")
+ name = f.name.replace("/dav"+self.davclient.cwd,"")
type = "-"
if name.endswith("/"):
type = "d"