From 205924ff294e5c0d9c57ed9a36dc899fcdd9c460 Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Fri, 1 Jul 2016 06:35:49 -0400 Subject: JavaScript popup for page delete confirmation --- view/tpl/wiki.tpl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index 7617808f4..d9a4f8be3 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -311,6 +311,9 @@ function wiki_delete_wiki(wikiHtmlName, resource_id) { ev.preventDefault(); return false; } + if(!confirm('Are you sure you want to delete the page: ' + window.wiki_page_name)) { + return; + } $.post("wiki/{{$channel}}/delete/page", {name: window.wiki_page_name, resource_id: window.wiki_resource_id}, function (data) { if (data.success) { -- cgit v1.2.3 From 50e581d88ad4901b13bbf99b2e58a5787b6bccec Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Sat, 9 Jul 2016 20:24:16 -0400 Subject: Set max-width for embedded images --- view/theme/redbasic/css/style.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 5768ccbd9..a63042b87 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2039,3 +2039,7 @@ dl.bb-dl > dd > li { border-style: solid; border-width: 5px; } + +#wiki-preview img { + max-width: 100%; +} \ No newline at end of file -- cgit v1.2.3 From 07b96f2430a7e1b2f4f80fa4daa6c6111b2546ca Mon Sep 17 00:00:00 2001 From: redmatrix Date: Mon, 18 Jul 2016 22:33:26 -0700 Subject: runaway cron emails --- boot.php | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/boot.php b/boot.php index b4a54e180..7974ce9ed 100755 --- a/boot.php +++ b/boot.php @@ -2457,24 +2457,16 @@ function check_cron_broken() { set_config('system','lastcroncheck',datetime_convert()); return; } - $t = get_config('system','lastcroncheck'); - if($t === false) { - // This is serious. Config storage isn't working. - // We just set lastcroncheck. The system is horked. - // However don't add insult to injury by sending an email - // to the admin every time a page is accessed. - // just quietly - return; - } if($t > datetime_convert('UTC','UTC','now - 3 days')) { // Wait for 3 days before we do anything so as not to swamp the admin with messages return; } + set_config('system','lastcroncheck',datetime_convert()); + if(($d) && ($d > datetime_convert('UTC','UTC','now - 3 days'))) { // Scheduled tasks have run successfully in the last 3 days. - set_config('system','lastcroncheck',datetime_convert()); return; } -- cgit v1.2.3 From da49befb1862c42abbefe07e0276dbdc8042468a Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Wed, 20 Jul 2016 05:44:29 -0400 Subject: Wiki delete page confirmation and max image width --- view/theme/redbasic/css/style.css | 4 ++++ view/tpl/wiki.tpl | 3 +++ 2 files changed, 7 insertions(+) diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index d61e60dc9..6cc3e2f10 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2037,3 +2037,7 @@ dl.bb-dl > dd > li { border-style: solid; border-width: 5px; } + +#wiki-preview img { + max-width: 100%; +} \ No newline at end of file diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index 7617808f4..d9a4f8be3 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -311,6 +311,9 @@ function wiki_delete_wiki(wikiHtmlName, resource_id) { ev.preventDefault(); return false; } + if(!confirm('Are you sure you want to delete the page: ' + window.wiki_page_name)) { + return; + } $.post("wiki/{{$channel}}/delete/page", {name: window.wiki_page_name, resource_id: window.wiki_resource_id}, function (data) { if (data.success) { -- cgit v1.2.3 From ca82b45fe41ad4ff511959dc2e85c55efcb68bc0 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 20 Jul 2016 20:43:12 +0200 Subject: fix /mail wsod issue reported by giac hellvecio --- Zotlabs/Zot/Finger.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Zot/Finger.php b/Zotlabs/Zot/Finger.php index 229fda8bd..e7603442f 100644 --- a/Zotlabs/Zot/Finger.php +++ b/Zotlabs/Zot/Finger.php @@ -28,7 +28,7 @@ class Finger { if (strpos($webbie,'@') === false) { $address = $webbie; - $host = App::get_hostname(); + $host = \App::get_hostname(); } else { $address = substr($webbie,0,strpos($webbie,'@')); $host = substr($webbie,strpos($webbie,'@')+1); @@ -127,4 +127,4 @@ class Finger { return $x; } -} \ No newline at end of file +} -- cgit v1.2.3 From 4da005e209624b43610aeefe30d7a9f9fe0ac7c0 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 20 Jul 2016 22:00:41 +0200 Subject: type m query in Acl.php should probably^Ceturn xchan_hash as hash and not as id. This fixes the issue that autocomplete for mail returns null for data.xid --- Zotlabs/Module/Acl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Module/Acl.php b/Zotlabs/Module/Acl.php index 15609c3c8..76a001fdd 100644 --- a/Zotlabs/Module/Acl.php +++ b/Zotlabs/Module/Acl.php @@ -222,7 +222,7 @@ class Acl extends \Zotlabs\Web\Controller { } elseif($type == 'm') { - $r = q("SELECT xchan_hash as id, xchan_name as name, xchan_addr as nick, xchan_photo_s as micro, xchan_url as url + $r = q("SELECT xchan_hash as hash, xchan_name as name, xchan_addr as nick, xchan_photo_s as micro, xchan_url as url FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d and ( (abook_their_perms = null) or (abook_their_perms & %d )>0) and xchan_deleted = 0 -- cgit v1.2.3