Changeset 2044569
- Timestamp:
- 03/05/2019 01:02:46 PM (7 years ago)
- Location:
- iteras/trunk
- Files:
-
- 9 edited
-
DEVELOPMENT.txt (modified) (1 diff)
-
README.txt (modified) (2 diffs)
-
admin/assets/css/admin.css (modified) (1 diff)
-
admin/iteras-admin.php (modified) (4 diffs)
-
iteras.php (modified) (1 diff)
-
languages/iteras-da_DK.mo (modified) (previous)
-
languages/iteras-da_DK.po (modified) (4 diffs)
-
public/assets/css/public.css (modified) (1 diff)
-
public/iteras-public.php (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
iteras/trunk/DEVELOPMENT.txt
r2035229 r2044569 21 21 == Translation == 22 22 23 Extracting and compiling new translation messages (rerun after translation :23 Extracting and compiling new translation messages (rerun after translation): 24 24 25 25 xgettext --indent --default-domain=iteras --language=PHP --keyword=__ --keyword=_e --sort-by-file --package-name=iteras --package-version=0.3 --msgid-bugs-address="team@iteras.dk" --output=languages/iteras-da_DK.pot `svn status -v -q | sed -e 's/ */ /g' | cut -d ' ' -f 5 | grep '.php$'` && msgmerge -o languages/iteras-da_DK.pox languages/iteras-da_DK.po languages/iteras-da_DK.pot && mv languages/iteras-da_DK.pox languages/iteras-da_DK.po && msgfmt -o languages/iteras-da_DK.mo languages/iteras-da_DK.po -
iteras/trunk/README.txt
r2035311 r2044569 3 3 Requires at least: 3.5.1 4 4 Tested up to: 5.1 5 Stable tag: 1. 2.15 Stable tag: 1.3.0 6 6 License: GPLv2 or later 7 7 License URI: http://www.gnu.org/licenses/gpl-2.0.html … … 70 70 71 71 == Changelog == 72 = 1.3.0 = 73 * Show paywalled content for editors 74 * Added indication if content is paywalled on post list view 75 * Fixed problem with default paywall configuration 76 72 77 = 1.2.1 = 73 78 * Tested with WordPress 5.1 -
iteras/trunk/admin/assets/css/admin.css
r1641255 r2044569 28 28 color: #777; 29 29 } 30 31 table tr .column-iteras-paywalled { 32 width: 60px; 33 text-align: center; 34 } 35 -
iteras/trunk/admin/iteras-admin.php
r1880949 r2044569 43 43 add_filter( 'plugin_action_links_' . $plugin_basename, array( $this, 'add_action_links' ) ); 44 44 45 // Add column on post list 46 add_filter( 'manage_post_posts_columns', array( $this, 'add_paywall_post_columns' ) ); 47 add_action( 'manage_post_posts_custom_column', array( $this, 'populate_paywall_post_columns' ), 10, 2 ); 48 45 49 add_action( 'load-post.php', array( $this, 'paywall_post_meta_boxes_setup' ) ); 46 50 add_action( 'load-post-new.php', array( $this, 'paywall_post_meta_boxes_setup' ) ); … … 82 86 83 87 88 function add_paywall_post_columns( $columns ) { 89 $columns["iteras-paywalled"] = __("Paywall"); 90 return $columns; 91 } 92 93 94 function populate_paywall_post_columns( $column, $post_id ) { 95 if ($column == "iteras-paywalled") { 96 $paywalled = !!get_post_meta($post_id, Iteras::POST_META_KEY, true); 97 echo '<div class="dashicons dashicons-'. ($paywalled ? "yes" : "no") .'"></div>'; 98 } 99 } 100 101 84 102 function paywall_post_meta_box( $post, $box ) { 85 103 $settings = $this->plugin->settings; 86 104 $domain = $this->plugin_slug; 87 88 $enabled_paywalls = get_post_meta($post->ID, Iteras::POST_META_KEY, true);89 105 90 106 $default_paywall = array(); … … 92 108 if ($default_access != "") 93 109 $default_paywall = array($default_access); 110 111 // check if the post has ITERAS metadata 112 if(in_array(Iteras::POST_META_KEY, get_post_custom_keys($post->ID))) { 113 $enabled_paywalls = get_post_meta($post->ID, Iteras::POST_META_KEY, true); 114 } 115 else { 116 $enabled_paywalls = $default_paywall; 117 } 94 118 95 119 // backwards compatibility … … 157 181 158 182 $screen = get_current_screen(); 159 if ( in_array($screen->id, array(" post", "settings_page_iteras")) ) {183 if ( in_array($screen->id, array("edit-post", "post", "settings_page_iteras")) ) { 160 184 wp_enqueue_style( $this->plugin_slug .'-admin-styles', plugins_url( 'assets/css/admin.css', __FILE__ ), array(), Iteras::VERSION ); 161 185 } -
iteras/trunk/iteras.php
r2035311 r2044569 13 13 * Plugin URI: https://app.iteras.dk 14 14 * Description: Integration with ITERAS, a cloud-based state-of-the-art system for managing subscriptions/memberships and payments. 15 * Version: 1. 2.115 * Version: 1.3.0 16 16 * Author: ITERAS 17 17 * Author URI: https://www.iteras.dk -
iteras/trunk/languages/iteras-da_DK.po
r1880949 r2044569 6 6 "Project-Id-Version: iteras\n" 7 7 "Report-Msgid-Bugs-To: team@iteras.dk\n" 8 "POT-Creation-Date: 201 8-05-24 18:24+0200\n"9 "PO-Revision-Date: 201 8-05-24 18:24+0200\n"8 "POT-Creation-Date: 2019-03-05 13:52+0100\n" 9 "PO-Revision-Date: 2019-03-05 13:51+0100\n" 10 10 "Last-Translator: Ole Laursen <olau@iteras.dk>\n" 11 11 "Language-Team: da\n" … … 15 15 "Content-Transfer-Encoding: 8bit\n" 16 16 17 #: admin/iteras-admin.php:5 117 #: admin/iteras-admin.php:55 18 18 msgid "Everybody" 19 19 msgstr "Alle" 20 20 21 #: admin/iteras-admin.php: 5721 #: admin/iteras-admin.php:61 22 22 msgid "Redirect to subscribe landing page" 23 23 msgstr "Omdiriger til abonnér-landingsside" 24 24 25 #: admin/iteras-admin.php: 5825 #: admin/iteras-admin.php:62 26 26 msgid "Cut text and add call-to-action box" 27 27 msgstr "Beskær tekst og tilføj call to action-boks" 28 28 29 #: admin/iteras-admin.php:6 229 #: admin/iteras-admin.php:66 30 30 msgid "Automatic" 31 31 msgstr "Automatisk" 32 32 33 #: admin/iteras-admin.php:6 333 #: admin/iteras-admin.php:67 34 34 msgid "Custom" 35 35 msgstr "Specialudviklet" 36 36 37 #: admin/iteras-admin.php:8 037 #: admin/iteras-admin.php:84 38 38 msgid "ITERAS Paywall" 39 39 msgstr "ITERAS-paywall" 40 40 41 #: admin/iteras-admin.php:109 41 #: admin/iteras-admin.php:89 42 msgid "Paywall" 43 msgstr "Betalingsmur" 44 45 #: admin/iteras-admin.php:133 42 46 msgid "Does not restrict visitors, everyone can see the content" 43 47 msgstr "Begrænser ingen besøgende, alle kan se indholdet" 44 48 45 #: admin/iteras-admin.php:1 1049 #: admin/iteras-admin.php:134 46 50 msgid "" 47 51 "Content restricted to visitors who are in the subscriber database (but they " … … 51 55 "have et aktivt abonnement)" 52 56 53 #: admin/iteras-admin.php:1 1157 #: admin/iteras-admin.php:135 54 58 msgid "Content restricted to visitors with an active subscription" 55 59 msgstr "Indhold begrænset til besøgende i abonnentdatabasen" 56 60 57 #: admin/iteras-admin.php: 17961 #: admin/iteras-admin.php:203 58 62 msgid "ITERAS configuration" 59 63 msgstr "ITERAS-konfiguration" 60 64 61 #: admin/iteras-admin.php: 18065 #: admin/iteras-admin.php:204 62 66 msgid "ITERAS" 63 67 msgstr "ITERAS" 64 68 65 #: admin/iteras-admin.php:2 1969 #: admin/iteras-admin.php:243 66 70 msgid "Synchronization of paywalls from ITERAS complete" 67 71 msgstr "Synkronisering af betalingsmure fra ITERAS gennemført" 68 72 69 #: admin/iteras-admin.php:2 2573 #: admin/iteras-admin.php:249 70 74 msgid "Couldn't synchronize paywalls from ITERAS" 71 75 msgstr "Kunne ikke synkronisere betalingsmure fra ITERAS" 72 76 73 #: admin/iteras-admin.php:2 5777 #: admin/iteras-admin.php:281 74 78 msgid "Settings" 75 79 msgstr "Indstillinger" … … 278 282 "%'>siden med indstillinger</a> for at rette dem." 279 283 280 #: public/iteras-public.php:402 284 #: public/iteras-public.php:397 285 msgid "This content is paywalled" 286 msgstr "Dette indhold er bag betalingsmur" 287 288 #: public/iteras-public.php:397 289 msgid "You are seeing the content because you are logged into WordPress admin" 290 msgstr "Du ser indholdet da du er logget ind i WordPress admin" 291 292 #: public/iteras-public.php:406 281 293 msgid "ITERAS plugin improperly configured. Paywall box content is missing" 282 294 msgstr "" -
iteras/trunk/public/assets/css/public.css
r1171668 r2044569 22 22 filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#00ffffff', endColorstr='#ffffff',GradientType=0 ); /* IE6-8 */ 23 23 } 24 25 .iteras-paywall-notice { 26 background-color: #d43939; 27 color: #fff; 28 padding: 15px; 29 line-height: 1.5; 30 text-align: center; 31 font-family: sans-serif; 32 border-radius: 3px; 33 } -
iteras/trunk/public/iteras-public.php
r2035311 r2044569 16 16 class Iteras { 17 17 18 const VERSION = '1. 2.1';18 const VERSION = '1.3.0'; 19 19 20 20 const SETTINGS_KEY = "iteras_settings"; … … 357 357 if ($computed_hmac !== false && $key && 358 358 (function_exists("hash_equals") ? !hash_equals($computed_hmac, $hmac) : $computed_hmac != $hmac)) 359 return false; 359 return false; 360 360 361 361 $parts = explode("|", $data); … … 393 393 394 394 $extra = ""; 395 // show message without paywall for editors 396 if (current_user_can('edit_pages') && !empty($paywall_ids)) { 397 $content = '<div class="iteras-paywall-notice"><b>'.__("This content is paywalled").'</b><br>'.__("You are seeing the content because you are logged into WordPress admin").'</div>'.$content; 398 } 395 399 // paywall the content 396 if (!empty($paywall_ids)) {400 else if (!empty($paywall_ids)) { 397 401 if ($this->settings['paywall_display_type'] == "samepage") { 398 402 … … 417 421 if ($this->settings['paywall_server_side_validation'] && 418 422 !(isset($_COOKIE['iteraspass']) 419 && $this->pass_authorized($_COOKIE['iteraspass'], $paywall_ids, $this->settings['api_key']))) {423 && $this->pass_authorized($_COOKIE['iteraspass'], $paywall_ids, $this->settings['api_key']))) { 420 424 $content = truncate_html($content, array_get($this->settings, 'paywall_snippet_size', self::DEFAULT_ARTICLE_SNIPPET_SIZE)); 421 425 $truncate_class = "iteras-content-truncated";
Note: See TracChangeset
for help on using the changeset viewer.