From abfbe9c9375c7505e0422b8adc1d9d5426d7df1a Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sun, 10 Apr 2016 16:56:08 -0700 Subject: a few issues: block public not blocking mod_cal, typo in sql for one clone file sync operation, fix_system_urls not catching cached contact photos, extend sessionhandler expiration when remember_me is enabled as the stored session is expiring long before the browser session. --- include/auth.php | 2 ++ include/import.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/auth.php b/include/auth.php index 21f0dded8..f31bc074d 100644 --- a/include/auth.php +++ b/include/auth.php @@ -275,9 +275,11 @@ else { // on the cookie if($_POST['remember_me']) { + $_SESSION['remember_me'] = 1; \Zotlabs\Web\Session::new_cookie(31449600); // one year } else { + $_SESSION['remember_me'] = 0; \Zotlabs\Web\Session::new_cookie(0); // 0 means delete on browser exit } diff --git a/include/import.php b/include/import.php index f15dedfe0..3b5c8508c 100644 --- a/include/import.php +++ b/include/import.php @@ -925,7 +925,7 @@ function sync_files($channel,$files) { $ext = ''; } - $r = q("select filename from attach where ( filename = '%s' OR filename like '%s' ) and folder == '%s' and hash != '%s' ", + $r = q("select filename from attach where ( filename = '%s' OR filename like '%s' ) and folder = '%s' and hash != '%s' ", dbesc($basename . $ext), dbesc($basename . '(%)' . $ext), dbesc($att['folder']), -- cgit v1.2.3