From 82e7743091ebbdbcb164618fbb3d50430f91ff68 Mon Sep 17 00:00:00 2001 From: Daisuke Date: Fri, 24 Sep 2021 14:02:28 -0500 Subject: [PATCH] 240921 Paste Upload and Default Visibility --- action.php | 5 +++ layout/footer.php | 86 ++++++++++++++++++++++---------------------- layout/header.php | 8 ++--- modules/settings.php | 11 ++++++ 4 files changed, 63 insertions(+), 47 deletions(-) diff --git a/action.php b/action.php index dd8cf62..b89d4ea 100644 --- a/action.php +++ b/action.php @@ -59,6 +59,10 @@ if (isset($_POST['action']) && $_POST['action'] == "settings"){ $user_settings['emoji'] = intval($value); break; + case "defscope": + $user_settings['defscope'] = intval($value); + break; + case "text": $user_settings['text'] = ($value == "on" ? "on" : "off"); break; @@ -71,6 +75,7 @@ if (isset($_POST['action']) && $_POST['action'] == "settings"){ $user_settings['replies'] = ($value == "on" ? "on" : "off"); break; + case "reblog": $user_settings['reblog'] = ($value == "on" ? "on" : "off"); break; diff --git a/layout/footer.php b/layout/footer.php index 7f18b46..a9c6cf8 100644 --- a/layout/footer.php +++ b/layout/footer.php @@ -393,31 +393,50 @@ $query = http_build_query(array_filter(array( }); - document.onpaste = function (event) { - var items = (event.clipboardData || event.originalEvent.clipboardData).items; - /*Make Sure Only One File is Copied*/ - if (items.length != 1) { - return; + /* paste to upload */ + document.onpaste = function(event){ + + var items = (event.clipboardData || event.originalEvent.clipboardData).items; + + for (var i = 0 ; i < items.length ; i++) { + + var item = items[i]; + + if (item.type.indexOf("image") != -1) { + + var file = item.getAsFile(); + console.log(file); + upload_file_with_ajax(file,file_uploaded); } - var item = items[0]; - /*Verify If The Copied Item is File*/ - if (item.kind === 'file') { - var file = item.getAsFile(); - var filename = file.name; - /*Get File Extension*/ - var ext = filename.split('.').reverse()[0].toLowerCase(); - /*Check Image File Extensions*/ - if (jQuery.inArray(ext, ['jpg', 'png']) > -1) { - /*Create FormData Instance*/ - var data = new FormData(); - data.append('file', file); - /*Request Ajax With File*/ - request_ajax_file('upload.php', data, file_uploaded); - } else { - alert('Invalid File'); + } + } + + function upload_file_with_ajax(file, ajax_callback){ + $("#postform .status").html(''); + var formData = new FormData(); + formData.append('file', file); + + $.ajax('./upload.php' , { + + type: 'POST', + contentType: false, + processData: false, + data: formData, + error: function() { + console.log("error"); + }, + success: function (response) { + if (typeof ajax_callback == 'function') { + ajax_callback(response); + } else if (typeof ajax_callback == 'string') { + if (ajax_callback != '') { + eval(ajax_callback + '(response)'); + } + } } - } - }; + }); + } + function file_uploaded(data) { if ($("#postform .uploadBox").length < 1){ @@ -435,26 +454,7 @@ $query = http_build_query(array_filter(array( $("#postform .status").html(''); } - /*Function to Make AJAX Request With File*/ - function request_ajax_file(ajax_url, ajax_data, ajax_callback) { - $("#postform .status").html(''); - jQuery.ajax({ - url: ajax_url, - data: ajax_data, - type: 'POST', - processData: false, - contentType: false, - success: function (response) { - if (typeof ajax_callback == 'function') { - ajax_callback(response); - } else if (typeof ajax_callback == 'string') { - if (ajax_callback != '') { - eval(ajax_callback + '(response)'); - } - } - } - }); - } + function upload_files() { $("#postform .status").html(''); diff --git a/layout/header.php b/layout/header.php index 7cf98cf..a928444 100644 --- a/layout/header.php +++ b/layout/header.php @@ -245,10 +245,10 @@ endif; ?> diff --git a/modules/settings.php b/modules/settings.php index b137177..540b2d3 100644 --- a/modules/settings.php +++ b/modules/settings.php @@ -44,6 +44,17 @@
Timeline + +

Default post vsibility

+
+ +
+

Show replies