From 31bea712048b245555ae12d07fa14d9c6855b00d Mon Sep 17 00:00:00 2001
From: lucha <lucha@paranoici.org>
Date: Mon, 25 Jun 2018 21:47:59 +0200
Subject: [PATCH] [auto] plugin: wp2pgpmail 1.23
---
.../wp2pgpmail/classes/formulaire.inc.php | 10 -----
.../plugins/wp2pgpmail/js/openpgp.min.js | 2 +-
wp-content/plugins/wp2pgpmail/readme.txt | 23 +++++++----
wp-content/plugins/wp2pgpmail/wp2pgpmail.php | 40 +++++++++++--------
4 files changed, 39 insertions(+), 36 deletions(-)
diff --git a/wp-content/plugins/wp2pgpmail/classes/formulaire.inc.php b/wp-content/plugins/wp2pgpmail/classes/formulaire.inc.php
index 2e4266f35..a8f50745e 100644
--- a/wp-content/plugins/wp2pgpmail/classes/formulaire.inc.php
+++ b/wp-content/plugins/wp2pgpmail/classes/formulaire.inc.php
@@ -39,16 +39,6 @@ class Formulaire {
$this->Output = <<<EOF
<!-- wp2pgpmail - Begin -->
-<script src="$siteurl/wp-content/plugins/wp2pgpmail/js/rsa.js" type="text/javascript"></script>
-<script src="$siteurl/wp-content/plugins/wp2pgpmail/js/aes-enc.js" type="text/javascript"></script>
-<script src="$siteurl/wp-content/plugins/wp2pgpmail/js/base64.js" type="text/javascript"></script>
-<script src="$siteurl/wp-content/plugins/wp2pgpmail/js/PGpubkey.js" type="text/javascript"></script>
-<script src="$siteurl/wp-content/plugins/wp2pgpmail/js/mouse.js" type="text/javascript"></script>
-<script src="$siteurl/wp-content/plugins/wp2pgpmail/js/PGencode.js" type="text/javascript"></script>
-
-<script src="$siteurl/wp-content/plugins/wp2pgpmail/js/fortuna.js" type="text/javascript"></script>
-<script src="$siteurl/wp-content/plugins/wp2pgpmail/js/crypto.getRandomValues.js" type="text/javascript"></script>
-<script src="$siteurl/wp-content/plugins/wp2pgpmail/js/openpgp.min.js" type="text/javascript"></script>
<script type="text/javascript">
var keytyp = 1;
diff --git a/wp-content/plugins/wp2pgpmail/js/openpgp.min.js b/wp-content/plugins/wp2pgpmail/js/openpgp.min.js
index 05a298b0e..3449d3de8 100644
--- a/wp-content/plugins/wp2pgpmail/js/openpgp.min.js
+++ b/wp-content/plugins/wp2pgpmail/js/openpgp.min.js
@@ -307,7 +307,7 @@ var crc_table=[0,8801531,25875725,17603062,60024545,51751450,35206124,44007191,1
1382365165,1399434779,1408230112,1366334967,1375129868,1358579962,1350304769,1430452783,1438955220,1422405410,1414423513,1456544974,1448562741,1465633219,1474135352];
function createcrc24(b){for(var a=11994318,c=0;16<b.length-c;)a=a<<8^crc_table[(a>>16^b.charCodeAt(c))&255],a=a<<8^crc_table[(a>>16^b.charCodeAt(c+1))&255],a=a<<8^crc_table[(a>>16^b.charCodeAt(c+2))&255],a=a<<8^crc_table[(a>>16^b.charCodeAt(c+3))&255],a=a<<8^crc_table[(a>>16^b.charCodeAt(c+4))&255],a=a<<8^crc_table[(a>>16^b.charCodeAt(c+5))&255],a=a<<8^crc_table[(a>>16^b.charCodeAt(c+6))&255],a=a<<8^crc_table[(a>>16^b.charCodeAt(c+7))&255],a=a<<8^crc_table[(a>>16^b.charCodeAt(c+8))&255],a=a<<8^crc_table[(a>>
16^b.charCodeAt(c+9))&255],a=a<<8^crc_table[(a>>16^b.charCodeAt(c+10))&255],a=a<<8^crc_table[(a>>16^b.charCodeAt(c+11))&255],a=a<<8^crc_table[(a>>16^b.charCodeAt(c+12))&255],a=a<<8^crc_table[(a>>16^b.charCodeAt(c+13))&255],a=a<<8^crc_table[(a>>16^b.charCodeAt(c+14))&255],a=a<<8^crc_table[(a>>16^b.charCodeAt(c+15))&255],c+=16;for(var d=c;d<b.length;d++)a=a<<8^crc_table[(a>>16^b.charCodeAt(c++))&255];return a&16777215}function openpgp_encoding_base64_encode(b){return s2r(b)}
-function openpgp_encoding_base64_decode(b){return r2s(b)}function openpgp_encoding_html_encode(b){return null==b?"":$("<div/>").text(b).html()}function openpgp_encoding_eme_pkcs1_encode(b,a){if(b.length>a-11)return-1;var c;c=""+String.fromCharCode(0);c+=String.fromCharCode(2);for(var d=0;d<a-b.length-3;d++)c+=String.fromCharCode(openpgp_crypto_getPseudoRandom(1,255));c+=String.fromCharCode(0);return c+b}
+function openpgp_encoding_base64_decode(b){return r2s(b)}function openpgp_encoding_html_encode(b){return null==b?"":jQuery("<div/>").text(b).html()}function openpgp_encoding_eme_pkcs1_encode(b,a){if(b.length>a-11)return-1;var c;c=""+String.fromCharCode(0);c+=String.fromCharCode(2);for(var d=0;d<a-b.length-3;d++)c+=String.fromCharCode(openpgp_crypto_getPseudoRandom(1,255));c+=String.fromCharCode(0);return c+b}
function openpgp_encoding_eme_pkcs1_decode(b,a){b.length<a&&(b=String.fromCharCode(0)+b);if(12>b.length||0!=b.charCodeAt(0)||2!=b.charCodeAt(1))return-1;for(var c=2;0!=b.charCodeAt(c)&&b.length>c;)c++;return b.substring(c+1,b.length)}hash_headers=[,[48,32,48,12,6,8,42,134,72,134,247,13,2,5,5,0,4,16],[48,33,48,9,6,5,43,14,3,2,26,5,0,4,20],[48,33,48,9,6,5,43,36,3,2,1,5,0,4,20]];hash_headers[8]=[48,49,48,13,6,9,96,134,72,1,101,3,4,2,1,5,0,4,32];
hash_headers[9]=[48,65,48,13,6,9,96,134,72,1,101,3,4,2,2,5,0,4,48];hash_headers[10]=[48,81,48,13,6,9,96,134,72,1,101,3,4,2,3,5,0,4,64];hash_headers[11]=[48,49,48,13,6,9,96,134,72,1,101,3,4,2,4,5,0,4,28];
function openpgp_encoding_emsa_pkcs1_encode(b,a,c){var d;d=""+String.fromCharCode(0);d+=String.fromCharCode(1);for(var e=0;e<c-hash_headers[b].length-3-openpgp_crypto_getHashByteLength(b);e++)d+=String.fromCharCode(255);d+=String.fromCharCode(0);for(e=0;e<hash_headers[b].length;e++)d+=String.fromCharCode(hash_headers[b][e]);d+=openpgp_crypto_hashData(b,a);return new BigInteger(util.hexstrdump(d),16)}
diff --git a/wp-content/plugins/wp2pgpmail/readme.txt b/wp-content/plugins/wp2pgpmail/readme.txt
index b10937cea..9aaad5ed6 100644
--- a/wp-content/plugins/wp2pgpmail/readme.txt
+++ b/wp-content/plugins/wp2pgpmail/readme.txt
@@ -3,8 +3,9 @@ Contributors: wp2pgpmail
Donate link: http://wp2pgpmail.com
Tags: PGP, mail, contact form, encrypt, crypt, privacy, encode, secure, encryption, GnuPG, GPG
Requires at least: 2.9.2
-Tested up to: 4.7.3
-Stable tag: 1.20
+Tested up to: 4.9.6
+Stable tag: 1.23
+Requires PHP: 5.6
License: GPLv2
License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -18,16 +19,13 @@ Don't have any PGP key? [Try our online PGP key generator](https://wp2pgpmail.co
**Get more features with [Gravity Forms PGP Encryption plugin](https://wp2pgpmail.com)**
-If you are using [Gravity Forms](http://bit.ly/GravityFormsPlugin), you can use the Pro version: [Gravity Forms PGP Encryption plugin](https://wp2pgpmail.com)
+If you are using [Gravity Forms](http://bit.ly/GravityFormsWordPress), you can use the Pro version: [Gravity Forms PGP Encryption plugin](https://wp2pgpmail.com)
[youtube http://www.youtube.com/watch?v=BAi66orTOUs]
-It's working with [Gravity Forms](http://bit.ly/GravityFormsPlugin), the best full featured contact form plugin for WordPress. You should also be interested with :
+It's working with [Gravity Forms](http://bit.ly/GravityFormsWordPress), the best full featured contact form plugin for WordPress.
-* [Gravity Tracking](https://www.gravitytracking.com/)
-* [Gravity Pushover](https://www.gravitypushover.com/)
-
-With the Pro version, you will get:
+With the paid version, you will get:
* Additional Fields
* Unlimited Forms
@@ -86,6 +84,15 @@ If you want to translate the Pro Edition, please [contact us !](https://wp2pgpma
Screenshots are available on the [wp2pgpmail plugin website](https://wp2pgpmail.com/screenshots/).
== Changelog ==
+= 1.23 =
+* Updating links
+
+= 1.22 =
+* Replacing $ by jQuery in the OpenPGP library
+
+= 1.21 =
+* Improving script integration
+
= 1.20 =
* Updating description
diff --git a/wp-content/plugins/wp2pgpmail/wp2pgpmail.php b/wp-content/plugins/wp2pgpmail/wp2pgpmail.php
index b35317c43..31f3f0bfb 100644
--- a/wp-content/plugins/wp2pgpmail/wp2pgpmail.php
+++ b/wp-content/plugins/wp2pgpmail/wp2pgpmail.php
@@ -3,11 +3,11 @@
Plugin Name: wp2pgpmail
Plugin URI: http://wp2pgpmail.com
Description: A simple PGP Mail Form Plugin for WordPress
-Version: 1.20
+Version: 1.23
Author: wp2pgpmail
Author URI: http://wp2pgpmail.com
License:
- Copyright 2010-2013 wp2pgpmail (e-mail : contact@wp2pgpmail.com)
+ Copyright 2010-2018 wp2pgpmail (e-mail : contact@wp2pgpmail.com)
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2, as
@@ -35,6 +35,11 @@ function wp2pgpmail_init(){
$image = new Securimage();
}
+function wp2pgpmail_form_enqueue_script() {
+ wp_enqueue_script( 'wp2pgpmail_script_openpgp', plugin_dir_url( __FILE__ ) . 'js/openpgp.min.js', array( 'jquery' ) );
+}
+add_action('wp_enqueue_scripts', 'wp2pgpmail_form_enqueue_script');
+
function wp2pgpmail_insert() {
if ( isset($_POST['submitted']) ) {
$image = new Securimage();
@@ -56,6 +61,16 @@ function wp2pgpmail_insert() {
}
}
+function wp2pgpmail_admin_enqueue_script() {
+ wp_enqueue_script( 'wp2pgpmail_script_rsa', plugin_dir_url( __FILE__ ) . 'js/rsa.js' );
+ wp_enqueue_script( 'wp2pgpmail_script_aes_enc', plugin_dir_url( __FILE__ ) . 'js/aes-enc.js' );
+ wp_enqueue_script( 'wp2pgpmail_script_sha1', plugin_dir_url( __FILE__ ) . 'js/sha1.js' );
+ wp_enqueue_script( 'wp2pgpmail_script_base64', plugin_dir_url( __FILE__ ) . 'js/base64.js' );
+ wp_enqueue_script( 'wp2pgpmail_script_PGpubkey', plugin_dir_url( __FILE__ ) . 'js/PGpubkey.js' );
+ wp_enqueue_script( 'wp2pgpmail_script_mouse', plugin_dir_url( __FILE__ ) . 'js/mouse.js' );
+}
+add_action('admin_enqueue_scripts', 'wp2pgpmail_admin_enqueue_script');
+
function wp2pgpmail_settings_page() {
wp_enqueue_style( 'wp2pgpmail-style', plugins_url( 'wp2pgpmail-pro' ) . '/css/wp2pgpmail-admin.css' );
if ( get_option('wp2pgpmail_pgpkey')==false || get_option('wp2pgpmail_pgpkey_vers')=='' ) {
@@ -65,13 +80,6 @@ function wp2pgpmail_settings_page() {
}
?>
-<script src="<?php echo site_url('/wp-content/plugins/wp2pgpmail/js/rsa.js'); ?>" type="text/javascript"></script>
-<script src="<?php echo site_url('/wp-content/plugins/wp2pgpmail/js/aes-enc.js'); ?>" type="text/javascript"></script>
-<script src="<?php echo site_url('/wp-content/plugins/wp2pgpmail/js/sha1.js'); ?>" type="text/javascript"></script>
-<script src="<?php echo site_url('/wp-content/plugins/wp2pgpmail/js/base64.js'); ?>" type="text/javascript"></script>
-<script src="<?php echo site_url('/wp-content/plugins/wp2pgpmail/js/PGpubkey.js'); ?>" type="text/javascript"></script>
-<script src="<?php echo site_url('/wp-content/plugins/wp2pgpmail/js/mouse.js'); ?>" type="text/javascript"></script>
-<script src="<?php echo site_url('/wp-content/plugins/wp2pgpmail/js/PGencode.js'); ?>" type="text/javascript"></script>
<script type="text/javascript">
var keytyp = -1;
@@ -119,9 +127,9 @@ function getkey() {
<br />
<h3><?php _e( 'Help Promote wp2pgpmail' , 'wp2pgpmail'); ?></h3>
<ul id="promote-wp2pgpmail">
- <li id="star"><b><a href="http://wp2pgpmail.com/" target="_blank"><?php _e( "Get wp2pgpmail Pro version with Additional Fields, Unlimited Forms, Nested Drag n' Drop and Advanced Email Configuration!" , 'wp2pgpmail'); ?></a></b></li>
- <li id="twitter"><?php _e( 'Follow us on Twitter' , 'wp2pgpmail'); ?>: <a href="https://twitter.com/#!/wp2pgpmail">@wp2pgpmail</a></li>
- <li id="star"><a href="http://wordpress.org/extend/plugins/wp2pgpmail/"><?php _e( 'Rate wp2pgpmail on WordPress.org' , 'wp2pgpmail'); ?></a></li>
+ <li id="star"><b><a href="https://wp2pgpmail.com/gravity-forms-pgp-encryption-plugin/" target="_blank"><?php _e( "Get Gravity Forms PGP Encryption with Additional Fields, Unlimited Forms, Nested Drag n' Drop and Advanced Email Configuration!" , 'wp2pgpmail'); ?></a></b></li>
+ <li id="twitter"><?php _e( 'Follow us on Twitter' , 'wp2pgpmail'); ?>: <a href="https://twitter.com/wp2pgpmail" target="_blank">@wp2pgpmail</a></li>
+ <li id="star"><a href="https://wordpress.org/plugins/wp2pgpmail/" target="_blank"><?php _e( 'Rate wp2pgpmail on WordPress.org' , 'wp2pgpmail'); ?></a></li>
</ul>
<br />
<h3><?php _e('PGP Key Setup', 'wp2pgpmail'); ?></h3>
@@ -129,7 +137,7 @@ function getkey() {
<br />
<?php echo $wp2pgpmail_message_settings; ?>
<br />
- <form name="s" action="javascript:getkey()">
+ <form name="s" action="javascript:getkey()">
<table width="600">
<tr>
<td>
@@ -186,10 +194,8 @@ function getkey() {
<h3><?php _e( 'Need help?' , 'wp2pgpmail'); ?></h3>
<ol>
- <li><a href="http://wp2pgpmail.com/about-pgp/"><?php _e( 'Infomation about PGP from wp2pgpmail' , 'wp2pgpmail'); ?></a></li>
- <li><a href="http://wp2pgpmail.com/faq/"><?php _e( 'wp2pgpmail FAQ' , 'wp2pgpmail'); ?></a></li>
- <li><a href="http://wp2pgpmail.com/support/"><?php _e( 'wp2pgpmail Support Ticket System' , 'wp2pgpmail'); ?></a></li>
- <li><a href="http://wordpress.org/tags/wp2pgpmail?forum_id=10"><?php _e( 'wp2pgpmail Forums' , 'wp2pgpmail'); ?></a></li>
+ <li><a href="https://wp2pgpmail.com/support/" target="_blank"><?php _e( 'Infomation about PGP from wp2pgpmail' , 'wp2pgpmail'); ?></a></li>
+ <li><a href="https://support.wp2pgpmail.com/" target="_blank"><?php _e( 'wp2pgpmail Support Ticket System' , 'wp2pgpmail'); ?></a></li>
</ol>
</div>
--
GitLab