harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't expire posts before 2001

Browse Source
This commit is contained in:
zotlabs 2016-10-10 22:44:11 -07:00
parent 896b46d18e
commit c6eecb06d5
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Zotlabs/Daemon/Cron.php
View File

@ -50,9 +50,8 @@ class Cron {
// expire any expired items // 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 ", and item_deleted = 0 ",
dbesc(NULL_DATE),
db_utcnow() db_utcnow()
); );
if($r) { if($r) {

4
util/zotsh/zotsh.py
View File

@ -55,7 +55,7 @@ class ZotSH(object):
@session.setter @session.setter
def session(self, session): def session(self, session):
self._session = 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 @property
def PS1(self): def PS1(self):
@ -205,7 +205,7 @@ class ZotSH(object):
print _fmt('d', 0, "../") print _fmt('d', 0, "../")
for f in r: for f in r:
name = f.name.replace("/cloud"+self.davclient.cwd,"") name = f.name.replace("/dav"+self.davclient.cwd,"")
type = "-" type = "-"
if name.endswith("/"): if name.endswith("/"):
type = "d" type = "d"