Changeset 2780110
- Timestamp:
- 09/05/2022 12:07:05 PM (4 years ago)
- Location:
- emailoctopus/trunk
- Files:
-
- 12 edited
-
composer.lock (modified) (13 diffs)
-
emailoctopus.php (modified) (2 diffs)
-
languages/emailoctopus.pot (modified) (6 diffs)
-
public/js/block.json (modified) (1 diff)
-
public/views/page-settings.php (modified) (1 diff)
-
readme.txt (modified) (2 diffs)
-
src/Ajax/Update_Settings.php (modified) (1 diff)
-
src/Utils.php (modified) (1 diff)
-
vendor/autoload.php (modified) (1 diff)
-
vendor/composer/autoload_real.php (modified) (2 diffs)
-
vendor/composer/autoload_static.php (modified) (2 diffs)
-
vendor/composer/installed.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
emailoctopus/trunk/composer.lock
r2774938 r2780110 589 589 { 590 590 "name": "phpstan/phpstan", 591 "version": "1.8. 2",591 "version": "1.8.3", 592 592 "source": { 593 593 "type": "git", 594 594 "url": "https://github.com/phpstan/phpstan.git", 595 "reference": " c53312ecc575caf07b0e90dee43883fdf90ca67c"596 }, 597 "dist": { 598 "type": "zip", 599 "url": "https://api.github.com/repos/phpstan/phpstan/zipball/ c53312ecc575caf07b0e90dee43883fdf90ca67c",600 "reference": " c53312ecc575caf07b0e90dee43883fdf90ca67c",595 "reference": "5583623b61caafebd62bc78a99533aa9d769d097" 596 }, 597 "dist": { 598 "type": "zip", 599 "url": "https://api.github.com/repos/phpstan/phpstan/zipball/5583623b61caafebd62bc78a99533aa9d769d097", 600 "reference": "5583623b61caafebd62bc78a99533aa9d769d097", 601 601 "shasum": "" 602 602 }, … … 622 622 ], 623 623 "description": "PHPStan - PHP Static Analysis Tool", 624 "keywords": [ 625 "dev", 626 "static analysis" 627 ], 624 628 "support": { 625 629 "issues": "https://github.com/phpstan/phpstan/issues", 626 "source": "https://github.com/phpstan/phpstan/tree/1.8. 2"630 "source": "https://github.com/phpstan/phpstan/tree/1.8.3" 627 631 }, 628 632 "funding": [ … … 634 638 "url": "https://github.com/phpstan", 635 639 "type": "github" 636 },637 {638 "url": "https://www.patreon.com/phpstan",639 "type": "patreon"640 640 }, 641 641 { … … 644 644 } 645 645 ], 646 "time": "2022-0 7-20T09:57:31+00:00"646 "time": "2022-09-01T15:27:34+00:00" 647 647 }, 648 648 { … … 845 845 { 846 846 "name": "symfony/console", 847 "version": "v5.4.1 1",847 "version": "v5.4.12", 848 848 "source": { 849 849 "type": "git", 850 850 "url": "https://github.com/symfony/console.git", 851 "reference": " 535846c7ee6bc4dd027ca0d93220601456734b10"852 }, 853 "dist": { 854 "type": "zip", 855 "url": "https://api.github.com/repos/symfony/console/zipball/ 535846c7ee6bc4dd027ca0d93220601456734b10",856 "reference": " 535846c7ee6bc4dd027ca0d93220601456734b10",851 "reference": "c072aa8f724c3af64e2c7a96b796a4863d24dba1" 852 }, 853 "dist": { 854 "type": "zip", 855 "url": "https://api.github.com/repos/symfony/console/zipball/c072aa8f724c3af64e2c7a96b796a4863d24dba1", 856 "reference": "c072aa8f724c3af64e2c7a96b796a4863d24dba1", 857 857 "shasum": "" 858 858 }, … … 924 924 ], 925 925 "support": { 926 "source": "https://github.com/symfony/console/tree/v5.4.1 1"926 "source": "https://github.com/symfony/console/tree/v5.4.12" 927 927 }, 928 928 "funding": [ … … 940 940 } 941 941 ], 942 "time": "2022-0 7-22T10:42:43+00:00"942 "time": "2022-08-17T13:18:05+00:00" 943 943 }, 944 944 { … … 1175 1175 { 1176 1176 "name": "symfony/filesystem", 1177 "version": "v5.4.1 1",1177 "version": "v5.4.12", 1178 1178 "source": { 1179 1179 "type": "git", 1180 1180 "url": "https://github.com/symfony/filesystem.git", 1181 "reference": " 6699fb0228d1bc35b12aed6dd5e7455457609ddd"1182 }, 1183 "dist": { 1184 "type": "zip", 1185 "url": "https://api.github.com/repos/symfony/filesystem/zipball/ 6699fb0228d1bc35b12aed6dd5e7455457609ddd",1186 "reference": " 6699fb0228d1bc35b12aed6dd5e7455457609ddd",1181 "reference": "2d67c1f9a1937406a9be3171b4b22250c0a11447" 1182 }, 1183 "dist": { 1184 "type": "zip", 1185 "url": "https://api.github.com/repos/symfony/filesystem/zipball/2d67c1f9a1937406a9be3171b4b22250c0a11447", 1186 "reference": "2d67c1f9a1937406a9be3171b4b22250c0a11447", 1187 1187 "shasum": "" 1188 1188 }, … … 1219 1219 "homepage": "https://symfony.com", 1220 1220 "support": { 1221 "source": "https://github.com/symfony/filesystem/tree/v5.4.1 1"1221 "source": "https://github.com/symfony/filesystem/tree/v5.4.12" 1222 1222 }, 1223 1223 "funding": [ … … 1235 1235 } 1236 1236 ], 1237 "time": "2022-0 7-20T13:00:38+00:00"1237 "time": "2022-08-02T13:48:16+00:00" 1238 1238 }, 1239 1239 { … … 2214 2214 { 2215 2215 "name": "symfony/string", 2216 "version": "v5.4.1 1",2216 "version": "v5.4.12", 2217 2217 "source": { 2218 2218 "type": "git", 2219 2219 "url": "https://github.com/symfony/string.git", 2220 "reference": " 5eb661e49ad389e4ae2b6e4df8d783a8a6548322"2221 }, 2222 "dist": { 2223 "type": "zip", 2224 "url": "https://api.github.com/repos/symfony/string/zipball/ 5eb661e49ad389e4ae2b6e4df8d783a8a6548322",2225 "reference": " 5eb661e49ad389e4ae2b6e4df8d783a8a6548322",2220 "reference": "2fc515e512d721bf31ea76bd02fe23ada4640058" 2221 }, 2222 "dist": { 2223 "type": "zip", 2224 "url": "https://api.github.com/repos/symfony/string/zipball/2fc515e512d721bf31ea76bd02fe23ada4640058", 2225 "reference": "2fc515e512d721bf31ea76bd02fe23ada4640058", 2226 2226 "shasum": "" 2227 2227 }, … … 2280 2280 ], 2281 2281 "support": { 2282 "source": "https://github.com/symfony/string/tree/v5.4.1 1"2282 "source": "https://github.com/symfony/string/tree/v5.4.12" 2283 2283 }, 2284 2284 "funding": [ … … 2296 2296 } 2297 2297 ], 2298 "time": "2022-0 7-24T16:15:25+00:00"2298 "time": "2022-08-12T17:03:11+00:00" 2299 2299 }, 2300 2300 { -
emailoctopus/trunk/emailoctopus.php
r2774938 r2780110 4 4 * Plugin URI: https://emailoctopus.com 5 5 * Description: Email marketing widget; easily add subscribers to an EmailOctopus list. Fully customisable. 6 * Version: 3.0. 06 * Version: 3.0.1 7 7 * Author: EmailOctopus 8 8 * Author URI: https://emailoctopus.com … … 21 21 22 22 if ( version_compare( PHP_VERSION, '7.4', '<' ) ) { 23 deactivate_plugins( plugin_basename( __FILE__ ) ); 24 wp_die( esc_html__( 'EmailOctopus requires PHP version 7.4 or higher.', 'emailoctopus' ) ); 23 require_once( ABSPATH . 'wp-admin/includes/plugin.php' ); 24 deactivate_plugins( plugin_basename( __FILE__ ) ); 25 wp_die( esc_html__( 'EmailOctopus requires PHP version 7.4 or higher.', 'emailoctopus' ) ); 25 26 } 26 27 27 define( 'EMAILOCTOPUS_VERSION', '3.0. 0' );28 define( 'EMAILOCTOPUS_VERSION', '3.0.1' ); 28 29 define( 'EMAILOCTOPUS_FILE', __FILE__ ); 29 30 define( 'EMAILOCTOPUS_DIR', plugin_dir_path( EMAILOCTOPUS_FILE ) ); -
emailoctopus/trunk/languages/emailoctopus.pot
r2774938 r2780110 3 3 msgid "" 4 4 msgstr "" 5 "Project-Id-Version: EmailOctopus 3.0. 0\n"5 "Project-Id-Version: EmailOctopus 3.0.1\n" 6 6 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/emailoctopus-wordpress-plugin\n" 7 7 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" … … 10 10 "Content-Type: text/plain; charset=UTF-8\n" 11 11 "Content-Transfer-Encoding: 8bit\n" 12 "POT-Creation-Date: 2022-0 8-24T12:56:19+00:00\n"12 "POT-Creation-Date: 2022-09-05T11:59:38+00:00\n" 13 13 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 14 14 "X-Generator: WP-CLI 2.6.0\n" … … 31 31 msgstr "" 32 32 33 #: emailoctopus.php:2 433 #: emailoctopus.php:25 34 34 msgid "EmailOctopus requires PHP version 7.4 or higher." 35 35 msgstr "" 36 36 37 37 #. Translators: Placeholder is the current directory. 38 #: emailoctopus.php:3 838 #: emailoctopus.php:39 39 39 msgid "Please run `composer install` in the plugin folder \"%s\" and try activating this plugin again." 40 40 msgstr "" … … 74 74 75 75 #: public/views/page-form.php:43 76 #: public/views/page-settings.php:4277 76 msgid "You'll need to enter a valid API key first." 78 77 msgstr "" … … 196 195 msgstr "" 197 196 197 #: public/views/page-settings.php:66 198 msgid "Status" 199 msgstr "" 200 201 #: public/views/page-settings.php:69 202 msgid "Connected" 203 msgstr "" 204 198 205 #: public/views/page-settings.php:72 199 msgid "Status"200 msgstr ""201 202 #: public/views/page-settings.php:75203 msgid "Connected"204 msgstr ""205 206 #: public/views/page-settings.php:78207 206 msgid "Disconnect" 208 207 msgstr "" 209 208 210 #: public/views/page-settings.php: 82209 #: public/views/page-settings.php:76 211 210 msgid "Not connected" 212 211 msgstr "" 213 212 214 #: public/views/page-settings.php:8 7213 #: public/views/page-settings.php:81 215 214 msgid "API Key" 216 215 msgstr "" 217 216 218 217 #. Translators: %s: <a> tags for EmailOctopus API documentation page link. 219 #: public/views/page-settings.php: 100218 #: public/views/page-settings.php:94 220 219 msgid "Your %1$sEmailOctopus API key%2$s, used to connect to your account." 221 220 msgstr "" 222 221 223 #: public/views/page-settings.php:10 7222 #: public/views/page-settings.php:101 224 223 #: src/Admin.php:138 225 224 msgid "Save Changes" … … 285 284 msgstr "" 286 285 287 #: src/Ajax/Update_Settings.php:6 3286 #: src/Ajax/Update_Settings.php:64 288 287 msgid "Your API key is invalid." 289 288 msgstr "" 290 289 291 #: src/Ajax/Update_Settings.php:6 8290 #: src/Ajax/Update_Settings.php:69 292 291 msgid "Could not establish a connection with the EmailOctopus API." 293 292 msgstr "" -
emailoctopus/trunk/public/js/block.json
r2774938 r2780110 4 4 "name": "emailoctopus/form", 5 5 "title": "EmailOctopus Form", 6 "version": "3.0. 0",6 "version": "3.0.1", 7 7 "textdomain": "emailoctopus", 8 8 "attributes": { -
emailoctopus/trunk/public/views/page-settings.php
r2774938 r2780110 37 37 </h1> 38 38 </div> 39 40 <?php if ( ! $api_key_valid && isset( $_GET['prompt'] ) && $_GET['prompt'] === 'api-key-required' ) : ?>41 <div class="emailoctopus-notice notice notice-warning">42 <p><?php esc_html_e( 'You\'ll need to enter a valid API key first.', 'emailoctopus' ); ?></p>43 </div>44 <?php endif; ?>45 39 46 40 <?php -
emailoctopus/trunk/readme.txt
r2774938 r2780110 46 46 47 47 == Changelog == 48 49 = 3.0.1 = 50 * Bug fixes and improvements. 48 51 49 52 = 3.0.0 = … … 143 146 == Upgrade Notice == 144 147 148 = 3.0.1 = 149 Bug fixes and improvements. 150 145 151 = 3.0.0 = 146 152 PHP 7.4 or greater is now required. -
emailoctopus/trunk/src/Ajax/Update_Settings.php
r2774938 r2780110 34 34 if ($is_valid_api_key === true) { 35 35 update_option('emailoctopus_api_key', $new_api_key); 36 Utils::clear_transients(); 36 37 37 38 if ($current_api_key) { -
emailoctopus/trunk/src/Utils.php
r2774938 r2780110 142 142 143 143 return false; 144 }145 146 /**147 * Look for a pre-3.0 form, whose data would exist in legacy custom DB tables.148 *149 * @param $form_id150 *151 * @return void152 */153 public static function get_legacy_form_by_id($form_id)154 {155 144 } 156 145 -
emailoctopus/trunk/vendor/autoload.php
r2774938 r2780110 10 10 require_once __DIR__ . '/composer/autoload_real.php'; 11 11 12 return ComposerAutoloaderInit 576b2f787b3aae02ce4df2babcb66c2d::getLoader();12 return ComposerAutoloaderInit448857686628a2233bb26e385680b6cf::getLoader(); -
emailoctopus/trunk/vendor/composer/autoload_real.php
r2774938 r2780110 3 3 // autoload_real.php @generated by Composer 4 4 5 class ComposerAutoloaderInit 576b2f787b3aae02ce4df2babcb66c2d5 class ComposerAutoloaderInit448857686628a2233bb26e385680b6cf 6 6 { 7 7 private static $loader; … … 23 23 } 24 24 25 spl_autoload_register(array('ComposerAutoloaderInit 576b2f787b3aae02ce4df2babcb66c2d', 'loadClassLoader'), true, true);25 spl_autoload_register(array('ComposerAutoloaderInit448857686628a2233bb26e385680b6cf', 'loadClassLoader'), true, true); 26 26 self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__)); 27 spl_autoload_unregister(array('ComposerAutoloaderInit 576b2f787b3aae02ce4df2babcb66c2d', 'loadClassLoader'));27 spl_autoload_unregister(array('ComposerAutoloaderInit448857686628a2233bb26e385680b6cf', 'loadClassLoader')); 28 28 29 29 require __DIR__ . '/autoload_static.php'; 30 call_user_func(\Composer\Autoload\ComposerStaticInit 576b2f787b3aae02ce4df2babcb66c2d::getInitializer($loader));30 call_user_func(\Composer\Autoload\ComposerStaticInit448857686628a2233bb26e385680b6cf::getInitializer($loader)); 31 31 32 32 $loader->setClassMapAuthoritative(true); -
emailoctopus/trunk/vendor/composer/autoload_static.php
r2774938 r2780110 5 5 namespace Composer\Autoload; 6 6 7 class ComposerStaticInit 576b2f787b3aae02ce4df2babcb66c2d7 class ComposerStaticInit448857686628a2233bb26e385680b6cf 8 8 { 9 9 public static $prefixLengthsPsr4 = array ( … … 39 39 { 40 40 return \Closure::bind(function () use ($loader) { 41 $loader->prefixLengthsPsr4 = ComposerStaticInit 576b2f787b3aae02ce4df2babcb66c2d::$prefixLengthsPsr4;42 $loader->prefixDirsPsr4 = ComposerStaticInit 576b2f787b3aae02ce4df2babcb66c2d::$prefixDirsPsr4;43 $loader->classMap = ComposerStaticInit 576b2f787b3aae02ce4df2babcb66c2d::$classMap;41 $loader->prefixLengthsPsr4 = ComposerStaticInit448857686628a2233bb26e385680b6cf::$prefixLengthsPsr4; 42 $loader->prefixDirsPsr4 = ComposerStaticInit448857686628a2233bb26e385680b6cf::$prefixDirsPsr4; 43 $loader->classMap = ComposerStaticInit448857686628a2233bb26e385680b6cf::$classMap; 44 44 45 45 }, null, ClassLoader::class); -
emailoctopus/trunk/vendor/composer/installed.php
r2774938 r2780110 4 4 'pretty_version' => 'dev-master', 5 5 'version' => 'dev-master', 6 'reference' => ' 08845bae9e48ae7f755330e995bd4dec4e9f4678',6 'reference' => 'cf62990660ec0f4feb16b8428c27d245a54671c4', 7 7 'type' => 'library', 8 8 'install_path' => __DIR__ . '/../../', … … 14 14 'pretty_version' => 'dev-master', 15 15 'version' => 'dev-master', 16 'reference' => ' 08845bae9e48ae7f755330e995bd4dec4e9f4678',16 'reference' => 'cf62990660ec0f4feb16b8428c27d245a54671c4', 17 17 'type' => 'library', 18 18 'install_path' => __DIR__ . '/../../',
Note: See TracChangeset
for help on using the changeset viewer.