Changeset 2792004
- Timestamp:
- 09/29/2022 04:00:53 PM (3 years ago)
- Location:
- linkpizza-manager/trunk
- Files:
-
- 9 edited
-
README.txt (modified) (2 diffs)
-
admin/class-linkPizza-Manager-admin.php (modified) (4 diffs)
-
admin/css/admin.css (modified) (1 diff)
-
includes/class-linkPizza-Manager-deactivator.php (modified) (1 diff)
-
includes/class-linkPizza-Manager-jobs.php (modified) (1 diff)
-
includes/class-linkPizza-Manager.php (modified) (2 diffs)
-
languages/linkpizza-manager.pot (modified) (15 diffs)
-
linkPizza-Manager.php (modified) (2 diffs)
-
shared/class-linkPizza-Manager-api-calls.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
linkpizza-manager/trunk/README.txt
r2618231 r2792004 3 3 Tags: monetization, linkpizza, linkPizza, affiliate, affiliate links, automated affiliate links 4 4 Requires at least: 5.4 5 Tested up to: 5.85 Tested up to: 6.0 6 6 Requires PHP: 5.4 7 Stable tag: 5.5. 17 Stable tag: 5.5.2 8 8 License: GPLv2 or later 9 9 License URI: http://www.gnu.org/licenses/gpl-2.0.html … … 73 73 74 74 == Changelog == 75 76 = 5.5.2 = 77 * Fix problem that accounts are logged out after 30 days. A background process will refresh the account before it expires, Crons must be enabled for this! 78 * Add notification in menu when user is not logged in. 79 75 80 76 81 = 5.5.1 = -
linkpizza-manager/trunk/admin/class-linkPizza-Manager-admin.php
r2567120 r2792004 509 509 <div class="pzz-dashboard-login" id="pzz-login"> 510 510 <div class="pzz-dashboard-message"> 511 <p><?php esc_html_e( ' Your LinkPizza installation is currently inactive, please log in start. If you do not have an account yet, please register on linkpizza.com first.', 'linkpizza-manager' ); ?></p>511 <p><?php esc_html_e( 'Log in or register quickly with LinkPizza and earn money thanks to the LinkPizza platform.', 'linkpizza-manager' ); ?></p> 512 512 </div> 513 513 <form id="pzz_refresh_statistics" method='post'> … … 791 791 */ 792 792 public function render_pzz_options_page() { 793 $access_oidc_token = get_option( PZZ_OIDC_ACCESS_TOKEN_OPTION_NAME ); 794 $refresh_oidcs_token = get_option( PZZ_OIDC_REFRESH_TOKEN_OPTION_NAME ); 795 $logged_in = ! ( null === $access_oidc_token || null === $refresh_oidcs_token || '' === $access_oidc_token || '' === $refresh_oidcs_token ); 796 ?> 797 <div class="pzz-dashboard-account"> 798 <h2> 799 <?php if ( $logged_in ) : ?> 800 <?php esc_html_e( 'Account', 'linkpizza-manager' ); ?></h2> 801 <?php else : ?> 802 <?php esc_html_e( 'You are not making any money (yet)!', 'linkpizza-manager' ); ?></h2> 803 <?php endif; ?> 804 <?php 805 // Check for old SSL version. 806 if ( ! ( defined( 'OPENSSL_TLSEXT_SERVER_NAME' ) && OPENSSL_TLSEXT_SERVER_NAME ) ) : 807 ?> 808 <div class="error"> 809 <p><?php esc_html_e( 'Your version of OpenSSL is outdated, please use at least version 0.9.8j to be able to use LinkPizza', 'linkpizza-manager' ); ?></p> 810 </div> 811 <?php 812 // Return because the login option probably won't work. 813 return; 814 endif; 815 ?> 816 817 <?php 818 $this->pzz_logged_in_user_render(); 819 ?> 820 </div> 821 822 <?php 793 823 $tab = ( isset( $_GET['tab'] ) ) ? sanitize_text_field( wp_unslash( $_GET['tab'] ) ) : 'general'; 794 824 $this->pzz_admin_tabs( $tab ); … … 863 893 */ 864 894 public function pzz_add_admin_menu() { 865 add_menu_page( 'LinkPizza', 'LinkPizza', 'manage_options', 'linkpizza-manager', array( &$this, 'render_pzz_options_page' ), plugins_url( '/assets/Icon-grey.png', __FILE__ ) ); 895 add_menu_page( 896 'LinkPizza', 897 'LinkPizza ' . $this->get_notification(), 898 'manage_options', 899 'linkpizza-manager', 900 array( &$this, 'render_pzz_options_page' ), 901 plugins_url( '/assets/Icon-grey.png', __FILE__ ) 902 ); 903 } 904 905 /** 906 * Gets notifications to be display in the admin menu bar. 907 * 908 * At this moment, there is only one notification possible. 909 * 910 * @return string html of the notification. 911 */ 912 public function get_notification() { 913 $access_oidc_token = get_option( PZZ_OIDC_ACCESS_TOKEN_OPTION_NAME ); 914 $refresh_oidcs_token = get_option( PZZ_OIDC_REFRESH_TOKEN_OPTION_NAME ); 915 916 $notification = null === $access_oidc_token || null === $refresh_oidcs_token || '' === $access_oidc_token || '' === $refresh_oidcs_token; 917 $notification_count = $notification ? 1 : 0; 918 /* translators: %s: number of notifications */ 919 $notifications = sprintf( _n( '%s notification', '%s notifications', $notification_count, 'linkpizza-manager' ), number_format_i18n( $notification_count ) ); 920 921 $counter = sprintf( '<span class="update-plugins count-%1$d"><span class="plugin-count" aria-hidden="true">%1$d</span><span class="screen-reader-text">%2$s</span></span>', $notification_count, $notifications ); 922 923 return $counter; 924 866 925 } 867 926 … … 967 1026 </div> 968 1027 </div> 969 <h2><?php esc_html_e( 'Account', 'linkpizza-manager' ); ?></h2> 970 <?php 971 // Check for old SSL version. 972 if ( ! ( defined( 'OPENSSL_TLSEXT_SERVER_NAME' ) && OPENSSL_TLSEXT_SERVER_NAME ) ) : 973 ?> 974 <div class="error"> 975 <p><?php esc_html_e( 'Your version of OpenSSL is outdated, please use at least version 0.9.8j to be able to use LinkPizza', 'linkpizza-manager' ); ?></p> 976 </div> 977 <?php 978 // Return because the login option probably won't work. 979 return; 980 endif; 981 ?> 982 <?php 983 $this->pzz_logged_in_user_render(); 984 // $this->pzz_oidc_token_render(); 1028 <?php 985 1029 } 986 1030 -
linkpizza-manager/trunk/admin/css/admin.css
r2618231 r2792004 66 66 width: 100%; 67 67 } 68 .pzz-dashboard-account { 69 margin: 10px 10px 30px; 70 } 68 71 69 72 .pzz-dashboard-login { -
linkpizza-manager/trunk/includes/class-linkPizza-Manager-deactivator.php
r2567120 r2792004 17 17 * @since 1.0.0 18 18 */ 19 public static function deactivate() {} 19 public static function deactivate() { 20 // Unregister cronjobs. 21 LinkPizza_Manager_Jobs::unschedule(); 22 } 20 23 } -
linkpizza-manager/trunk/includes/class-linkPizza-Manager-jobs.php
r2567120 r2792004 10 10 */ 11 11 12 // TODO: Nothing here, remove this? 12 /** 13 * Manager for all CronJobs 14 */ 15 class LinkPizza_Manager_Jobs { 16 17 /** 18 * The ID of this plugin. 19 * 20 * @since 1.0.0 21 * @access private 22 * @var string $plugin_name The ID of this plugin. 23 */ 24 private $plugin_name; 25 26 /** 27 * The version of this plugin. 28 * 29 * @since 1.0.0 30 * @access private 31 * @var string $version The current version of this plugin. 32 */ 33 private $version; 34 35 /** 36 * Initialize the class and set its properties. 37 * 38 * @since 1.0.0 39 * @param string $plugin_name The name of the plugin. 40 * @param string $version The version of this plugin. 41 */ 42 public function __construct( $plugin_name, $version ) { 43 $this->plugin_name = $plugin_name; 44 $this->version = $version; 45 } 46 47 /** 48 * Initializes cron job hooks. 49 * 50 * @since 5.5.2 51 * @return void 52 */ 53 public function init_hooks() { 54 add_action( 'linkpizza_refresh_token', array( $this, 'refresh_token' ) ); 55 } 56 57 /** 58 * Hook to refresh the OAuth token. 59 * 60 * @since 5.5.2 61 * @return void 62 */ 63 public function refresh_token() { 64 $response = pzz_do_oauth_call_with_refresh_check( PZZ_OIDC_API_BASE_PATH . '/user/me', array(), 0 ); 65 66 // pzz_write_log( $response ); 67 } 68 69 /** 70 * Initializes the scheduling of the cron jobs. 71 * 72 * @since 5.5.2 73 * @return void 74 */ 75 public function schedule() { 76 if ( ! wp_next_scheduled( 'linkpizza_refresh_token' ) ) { 77 wp_schedule_event( time(), 'daily', 'linkpizza_refresh_token' ); 78 } 79 } 80 81 /** 82 * Unhook the cron jobs. 83 * 84 * @since 5.5.2 85 * @return void 86 */ 87 public static function unschedule() { 88 $timestamp = wp_next_scheduled( 'linkpizza_refresh_token' ); 89 wp_unschedule_event( $timestamp, 'linkpizza_refresh_token' ); 90 } 91 } -
linkpizza-manager/trunk/includes/class-linkPizza-Manager.php
r2567120 r2792004 76 76 $this->define_widget_hooks(); 77 77 $this->define_shortcode_hooks(); 78 $this->define_jobs(); 78 79 79 80 } … … 266 267 267 268 /** 269 * Define cron jobs. 270 * 271 * @since 5.5.2 272 * @return void 273 */ 274 private function define_jobs() { 275 $plugin_jobs = new LinkPizza_Manager_Jobs( $this->get_plugin_name(), $this->get_version() ); 276 $this->loader->add_action( 'init', $plugin_jobs, 'init_hooks' ); 277 $this->loader->add_action( 'init', $plugin_jobs, 'schedule' ); 278 } 279 280 /** 268 281 * Run the loader to execute all of the hooks with WordPress. 269 282 * -
linkpizza-manager/trunk/languages/linkpizza-manager.pot
r2567120 r2792004 2 2 msgid "" 3 3 msgstr "" 4 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"5 4 "Project-Id-Version: linkPizza-Manager\n" 6 "POT-Creation-Date: 202 1-04-24 08:35+0200\n"5 "POT-Creation-Date: 2022-09-29 17:31+0200\n" 7 6 "PO-Revision-Date: 2021-04-03 09:44+0200\n" 8 7 "Last-Translator: \n" … … 11 10 "Content-Type: text/plain; charset=UTF-8\n" 12 11 "Content-Transfer-Encoding: 8bit\n" 13 "X-Generator: Poedit 2.4.2\n" 12 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" 13 "X-Generator: Poedit 3.1.1\n" 14 14 "X-Poedit-Basepath: ..\n" 15 15 "X-Poedit-Flags-xgettext: --add-comments=translators:\n" … … 53 53 54 54 #: admin/class-linkPizza-Manager-admin.php:258 55 #: admin/class-linkPizza-Manager-admin.php:8 2855 #: admin/class-linkPizza-Manager-admin.php:858 56 56 msgid "Advanced" 57 57 msgstr "" 58 58 59 59 #: admin/class-linkPizza-Manager-admin.php:265 60 #: admin/class-linkPizza-Manager-admin.php:8 2960 #: admin/class-linkPizza-Manager-admin.php:859 61 61 msgid "Help" 62 62 msgstr "" … … 162 162 #: admin/class-linkPizza-Manager-admin.php:511 163 163 msgid "" 164 " Your LinkPizza installation is currently inactive, please log in start. If"165 " you do not have an account yet, please register on linkpizza.com first."164 "Log in or register quickly with LinkPizza and earn money thanks to the " 165 "LinkPizza platform." 166 166 msgstr "" 167 167 … … 272 272 msgstr "" 273 273 274 #: admin/class-linkPizza-Manager-admin.php:826 275 #: admin/class-linkPizza-Manager-admin.php:1053 274 #: admin/class-linkPizza-Manager-admin.php:800 275 msgid "Account" 276 msgstr "" 277 278 #: admin/class-linkPizza-Manager-admin.php:802 279 msgid "You are not making any money (yet)!" 280 msgstr "" 281 282 #: admin/class-linkPizza-Manager-admin.php:809 283 msgid "" 284 "Your version of OpenSSL is outdated, please use at least version 0.9.8j to " 285 "be able to use LinkPizza" 286 msgstr "" 287 288 #: admin/class-linkPizza-Manager-admin.php:856 289 #: admin/class-linkPizza-Manager-admin.php:1097 276 290 msgid "General" 277 291 msgstr "" 278 292 279 #: admin/class-linkPizza-Manager-admin.php:8 27293 #: admin/class-linkPizza-Manager-admin.php:857 280 294 msgid "Link Summary" 281 295 msgstr "" 282 296 283 #: admin/class-linkPizza-Manager-admin.php:879 297 #. translators: %s: number of notifications 298 #: admin/class-linkPizza-Manager-admin.php:919 299 #, php-format 300 msgid "%s notification" 301 msgid_plural "%s notifications" 302 msgstr[0] "" 303 msgstr[1] "" 304 305 #: admin/class-linkPizza-Manager-admin.php:937 306 msgid "Go to the plugin page on wordpress.org" 307 msgstr "" 308 309 #: admin/class-linkPizza-Manager-admin.php:938 284 310 msgid "What is LinkPizza?" 285 311 msgstr "" 286 312 287 #: admin/class-linkPizza-Manager-admin.php: 887313 #: admin/class-linkPizza-Manager-admin.php:946 288 314 #, php-format 289 315 msgid "" … … 294 320 msgstr "" 295 321 296 #: admin/class-linkPizza-Manager-admin.php: 895322 #: admin/class-linkPizza-Manager-admin.php:954 297 323 msgid "What does the plugin do?" 298 324 msgstr "" 299 325 300 #: admin/class-linkPizza-Manager-admin.php: 899326 #: admin/class-linkPizza-Manager-admin.php:958 301 327 msgid "" 302 328 "By signing up for LinkPizza and installing this plugin, your links are " … … 310 336 msgstr "" 311 337 312 #: admin/class-linkPizza-Manager-admin.php:9 07338 #: admin/class-linkPizza-Manager-admin.php:966 313 339 msgid "Widgets" 314 340 msgstr "" 315 341 316 #: admin/class-linkPizza-Manager-admin.php:9 11342 #: admin/class-linkPizza-Manager-admin.php:970 317 343 msgid "" 318 344 "This plugin ships with 2 link widgets for you to use, an automatic and a " … … 321 347 msgstr "" 322 348 323 #: admin/class-linkPizza-Manager-admin.php:9 24349 #: admin/class-linkPizza-Manager-admin.php:983 324 350 #, php-format 325 351 msgid "" … … 328 354 msgstr "" 329 355 330 #: admin/class-linkPizza-Manager-admin.php:9 35356 #: admin/class-linkPizza-Manager-admin.php:994 331 357 msgid "Questions" 332 358 msgstr "" 333 359 334 #: admin/class-linkPizza-Manager-admin.php: 943360 #: admin/class-linkPizza-Manager-admin.php:1002 335 361 #, php-format 336 362 msgid "" … … 339 365 msgstr "" 340 366 341 #: admin/class-linkPizza-Manager-admin.php: 958367 #: admin/class-linkPizza-Manager-admin.php:1017 342 368 #, php-format 343 369 msgid "" … … 346 372 msgstr "" 347 373 348 #: admin/class-linkPizza-Manager-admin.php:969 349 msgid "Account" 350 msgstr "" 351 352 #: admin/class-linkPizza-Manager-admin.php:975 353 msgid "" 354 "Your version of OpenSSL is outdated, please use at least version 0.9.8j to " 355 "be able to use LinkPizza" 356 msgstr "" 357 358 #: admin/class-linkPizza-Manager-admin.php:998 359 #: admin/class-linkPizza-Manager-admin.php:1012 360 #: admin/class-linkPizza-Manager-admin.php:1327 374 #: admin/class-linkPizza-Manager-admin.php:1042 375 #: admin/class-linkPizza-Manager-admin.php:1056 376 #: admin/class-linkPizza-Manager-admin.php:1371 361 377 msgid "LinkPizza" 362 378 msgstr "" 363 379 364 #: admin/class-linkPizza-Manager-admin.php:1 056380 #: admin/class-linkPizza-Manager-admin.php:1100 365 381 msgid "" 366 382 "Only track statistics but don't change links on this page to affiliate links." 367 383 msgstr "" 368 384 369 #: admin/class-linkPizza-Manager-admin.php:1 058385 #: admin/class-linkPizza-Manager-admin.php:1102 370 386 msgid "" 371 387 "Disable LinkPizza (automatic affiliate links and tracking) for this specific " … … 373 389 msgstr "" 374 390 375 #: admin/class-linkPizza-Manager-admin.php:1 061391 #: admin/class-linkPizza-Manager-admin.php:1105 376 392 msgid "Disable link summary for this specific post or page." 377 393 msgstr "" 378 394 379 #: admin/class-linkPizza-Manager-admin.php:1 064395 #: admin/class-linkPizza-Manager-admin.php:1108 380 396 msgid "Turn affiliate off for specific links" 381 397 msgstr "" 382 398 383 #: admin/class-linkPizza-Manager-admin.php:1 090399 #: admin/class-linkPizza-Manager-admin.php:1134 384 400 msgid "Domain" 385 401 msgstr "" 386 402 387 #: admin/class-linkPizza-Manager-admin.php:1 091403 #: admin/class-linkPizza-Manager-admin.php:1135 388 404 msgid "Tracking only *" 389 405 msgstr "" 390 406 391 #: admin/class-linkPizza-Manager-admin.php:1 093407 #: admin/class-linkPizza-Manager-admin.php:1137 392 408 msgid "Disable" 393 409 msgstr "" 394 410 395 #: admin/class-linkPizza-Manager-admin.php:1 095411 #: admin/class-linkPizza-Manager-admin.php:1139 396 412 msgid "Monetizable **" 397 413 msgstr "" 398 414 399 #: admin/class-linkPizza-Manager-admin.php:11 24400 #: admin/class-linkPizza-Manager-admin.php:11 25415 #: admin/class-linkPizza-Manager-admin.php:1168 416 #: admin/class-linkPizza-Manager-admin.php:1169 401 417 #: widget/class-linkPizza-Manager-widget.php:133 402 418 msgid "Monetized" 403 419 msgstr "" 404 420 405 #: admin/class-linkPizza-Manager-admin.php:11 31406 #: admin/class-linkPizza-Manager-admin.php:11 32421 #: admin/class-linkPizza-Manager-admin.php:1175 422 #: admin/class-linkPizza-Manager-admin.php:1176 407 423 #: widget/class-linkPizza-Manager-widget.php:137 408 424 msgid "Not Monetized" 409 425 msgstr "" 410 426 411 #: admin/class-linkPizza-Manager-admin.php:11 44427 #: admin/class-linkPizza-Manager-admin.php:1188 412 428 msgid "" 413 429 "* Tracking only: Only track statistics but don't change this link to an " … … 415 431 msgstr "" 416 432 417 #: admin/class-linkPizza-Manager-admin.php:11 46433 #: admin/class-linkPizza-Manager-admin.php:1190 418 434 msgid "** Monetizable: LinkPizza can monetize this link automatically for you" 419 435 msgstr "" 420 436 421 #: admin/class-linkPizza-Manager-admin.php:11 54437 #: admin/class-linkPizza-Manager-admin.php:1198 422 438 msgid "" 423 439 "You haven't added any links to your blogpost, maybe you want to add some" 424 440 msgstr "" 425 441 426 #: admin/class-linkPizza-Manager-admin.php:1 156442 #: admin/class-linkPizza-Manager-admin.php:1200 427 443 msgid "advertiser links" 428 444 msgstr "" 429 445 430 #: admin/class-linkPizza-Manager-admin.php:1 156446 #: admin/class-linkPizza-Manager-admin.php:1200 431 447 msgid "to monetize this post?" 432 448 msgstr "" 433 449 434 #: admin/class-linkPizza-Manager-admin.php:1 162450 #: admin/class-linkPizza-Manager-admin.php:1206 435 451 msgid "" 436 452 "It seems your WordPress is missing php-xml, please ask your hosting to " … … 438 454 msgstr "" 439 455 440 #: admin/class-linkPizza-Manager-admin.php:13 13456 #: admin/class-linkPizza-Manager-admin.php:1357 441 457 msgid "Settings" 442 458 msgstr "" 443 459 444 #: admin/class-linkPizza-Manager-admin.php:13 14460 #: admin/class-linkPizza-Manager-admin.php:1358 445 461 msgid "Sign up" 446 462 msgstr "" 447 463 448 #: admin/class-linkPizza-Manager-admin.php:1 367464 #: admin/class-linkPizza-Manager-admin.php:1411 449 465 msgid "Disable LinkPiza" 450 466 msgstr "" 451 467 452 #: admin/class-linkPizza-Manager-admin.php:1 368468 #: admin/class-linkPizza-Manager-admin.php:1412 453 469 msgid "(Re)enable LinkPiza" 454 470 msgstr "" 455 471 456 472 #. translators: %s is replaced with the post_count 457 #: admin/class-linkPizza-Manager-admin.php:14 13473 #: admin/class-linkPizza-Manager-admin.php:1457 458 474 #, php-format 459 475 msgid "LinkPizza disabled on %s posts/pages" … … 461 477 462 478 #. translators: %s is replaced with the post_count 463 #: admin/class-linkPizza-Manager-admin.php:14 26479 #: admin/class-linkPizza-Manager-admin.php:1470 464 480 #, php-format 465 481 msgid "LinkPizza enabled on %s posts/pages" -
linkpizza-manager/trunk/linkPizza-Manager.php
r2618231 r2792004 12 12 * Plugin URI: http://linkpizza.com 13 13 * Description: Using LinkPizza all links on your website will be automatically monetized. 14 * Version: 5.5. 114 * Version: 5.5.2 15 15 * Author: Arjan Pronk 16 16 * Author URI: [email protected] … … 26 26 } 27 27 28 define( 'PZZ_VERSION', '5.5 ' );28 define( 'PZZ_VERSION', '5.5.2' ); 29 29 30 30 /** -
linkpizza-manager/trunk/shared/class-linkPizza-Manager-api-calls.php
r2567120 r2792004 46 46 add_option( PZZ_OIDC_REFRESH_TOKEN_OPTION_NAME, $refresh_oidc_token, '', 'yes' ); 47 47 } 48 pzz_do_oauth_call_with_refresh_check( $url, $parameters, $retries + 1 );48 return pzz_do_oauth_call_with_refresh_check( $url, $parameters, $retries + 1 ); 49 49 } else { 50 50 update_option( PZZ_OIDC_ACCESS_TOKEN_OPTION_NAME, '', 'yes' );
Note: See TracChangeset
for help on using the changeset viewer.
