Skip to content

Commit

Permalink
Merge pull request #50 from timse201/patch-1
Browse files Browse the repository at this point in the history 
New Links, Link correction, PayPal -> Donate
  • Loading branch information
@Zodiac1978
Zodiac1978 committed Jan 17, 2017
2 parents 4ed6999 + 8548e03 commit e0fdbb9
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 53 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
View file
Expand Up @@ -43,12 +43,12 @@
### 2.6.5 ###
* **English**
* Fix: Return parameters on `dashboard_glance_items` callback / thx [@toscho](https://twitter.com/toscho)
* New function: Trust commenters with a Gravatar / thx [@glueckpress](https://twitter.com/glueckpress)
* New function: [Trust commenters with a Gravatar](https://github.com/pluginkollektiv/antispam-bee/wiki/en-Documentation) / thx [@glueckpress](https://twitter.com/glueckpress)
* Additional plausibility checks and filters
* *Release time investment (Development & QA): 12 h*
* **Deutsch**
* Fix: Parameter-Rückgabe bei `dashboard_glance_items` / thx [@toscho](https://twitter.com/toscho)
* Neue Funktion: [Kommentatoren mit Gravatar vertrauen](https://github.com/pluginkollektiv/antispam-bee/wiki/Dokumentation) / thx [@glueckpress](https://twitter.com/glueckpress)
* Neue Funktion: [Kommentatoren mit Gravatar vertrauen](https://github.com/pluginkollektiv/antispam-bee/wiki/de-Dokumentation) / thx [@glueckpress](https://twitter.com/glueckpress)
* Zusätzliche Plausibilitätsprüfungen und Filter
* *Release-Zeitaufwand (Development & QA): 12 Stunden*

Expand Down
3 changes: 2 additions & 1 deletion antispam_bee.php
View file
Expand Up @@ -518,7 +518,8 @@ public static function init_row_meta($input, $file)
return array_merge(
$input,
array(
'<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=8CH5FPR88QYML" target="_blank">PayPal</a>',
'<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=8CH5FPR88QYML" target="_blank" rel="noopener noreferrer">' . esc_html__( 'Donate', 'antispam-bee' ) . '</a>',
'<a href="https://wordpress.org/support/plugin/antispam-bee" target="_blank" rel="noopener noreferrer">' . esc_html__( 'Support', 'antispam-bee' ) . '</a>',
)
);
}
Expand Down
103 changes: 53 additions & 50 deletions inc/gui.class.php
View file
Expand Up @@ -160,74 +160,74 @@ public static function options_page() { ?>

<div class="ab-column ab-arrow">
<h3 class="icon">
<?php esc_html_e('Antispam filter', 'antispam-bee') ?>
<?php esc_html_e( 'Antispam filter', 'antispam-bee' ); ?>
</h3>
<h6>
<?php esc_html_e('Filter in the execution order', 'antispam-bee') ?>
<?php esc_html_e( 'Filter in the execution order', 'antispam-bee' ); ?>
</h6>

<ul>
<li>
<input type="checkbox" name="ab_already_commented" id="ab_already_commented" value="1" <?php checked($options['already_commented'], 1) ?> />
<label for="ab_already_commented">
<?php esc_html_e('Trust approved commenters', 'antispam-bee') ?>
<span><?php esc_html_e('Always approve previously approved users', 'antispam-bee') ?></span>
<?php esc_html_e( 'Trust approved commenters', 'antispam-bee' ); ?>
<span><?php esc_html_e( 'Always approve previously approved users', 'antispam-bee' ); ?></span>
</label>
</li>

<li>
<input type="checkbox" name="ab_gravatar_check" id="ab_gravatar_check" value="1" <?php checked($options['gravatar_check'], 1) ?> />
<label for="ab_gravatar_check">
<?php esc_html_e('Trust commenters with a Gravatar', 'antispam-bee') ?>
<span><?php _e('Check if commenter has a Gravatar image', 'antispam-bee') ?></span>
<?php esc_html_e( 'Trust commenters with a Gravatar', 'antispam-bee' ); ?>
<span><?php esc_html_e( 'Check if commenter has a Gravatar image', 'antispam-bee' ); ?></span>
</label>
</li>

<li>
<input type="checkbox" name="ab_time_check" id="ab_time_check" value="1" <?php checked($options['time_check'], 1) ?> />
<label for="ab_time_check">
<?php esc_html_e('Consider the comment time', 'antispam-bee') ?>
<span><?php esc_html_e('Not recommended when using page caching', 'antispam-bee') ?></span>
<?php esc_html_e( 'Consider the comment time', 'antispam-bee' ); ?>
<span><?php esc_html_e( 'Not recommended when using page caching', 'antispam-bee' ); ?></span>
</label>
</li>

<li>
<input type="checkbox" name="ab_bbcode_check" id="ab_bbcode_check" value="1" <?php checked($options['bbcode_check'], 1) ?> />
<label for="ab_bbcode_check">
<?php esc_html_e('BBCode is spam', 'antispam-bee') ?>
<span><?php esc_html_e('Review the comment contents for BBCode links', 'antispam-bee') ?></span>
<?php esc_html_e( 'BBCode is spam', 'antispam-bee' ); ?>
<span><?php esc_html_e( 'Review the comment contents for BBCode links', 'antispam-bee' ); ?></span>
</label>
</li>

<li>
<input type="checkbox" name="ab_advanced_check" id="ab_advanced_check" value="1" <?php checked($options['advanced_check'], 1) ?> />
<label for="ab_advanced_check">
<?php esc_html_e('Validate the ip address of commenters', 'antispam-bee') ?>
<span><?php esc_html_e('Validity check for used ip address', 'antispam-bee') ?></span>
<?php esc_html_e( 'Validate the ip address of commenters', 'antispam-bee' ); ?>
<span><?php esc_html_e( 'Validity check for used ip address', 'antispam-bee' ); ?></span>
</label>
</li>

<li>
<input type="checkbox" name="ab_regexp_check" id="ab_regexp_check" value="1" <?php checked($options['regexp_check'], 1) ?> />
<label for="ab_regexp_check">
<?php esc_html_e('Use regular expressions', 'antispam-bee') ?>
<span><?php _e('Predefined and custom patterns by <a href="https://gist.github.com/4242142" target="_blank">plugin hook</a>', 'antispam-bee') ?></span>
<?php esc_html_e( 'Use regular expressions', 'antispam-bee' ); ?>
<span><?php esc_html_e( 'Predefined and custom patterns by plugin hook', 'antispam-bee' ); ?></span>
</label>
</li>

<li>
<input type="checkbox" name="ab_spam_ip" id="ab_spam_ip" value="1" <?php checked($options['spam_ip'], 1) ?> />
<label for="ab_spam_ip">
<?php esc_html_e('Look in the local spam database', 'antispam-bee') ?>
<span><?php esc_html_e('Already marked as spam? Yes? No?', 'antispam-bee') ?></span>
<?php esc_html_e( 'Look in the local spam database', 'antispam-bee' ); ?>
<span><?php esc_html_e( 'Already marked as spam? Yes? No?', 'antispam-bee' ); ?></span>
</label>
</li>

<li>
<input type="checkbox" name="ab_dnsbl_check" id="ab_dnsbl_check" value="1" <?php checked($options['dnsbl_check'], 1) ?> />
<label for="ab_dnsbl_check">
<?php esc_html_e('Use a public antispam database', 'antispam-bee') ?>
<span><?php _e('Matching the ip address with <a href="http://www.stopforumspam.com/" target="_blank">Stopforumspam</a>', 'antispam-bee') ?></span>
<?php esc_html_e( 'Use a public antispam database', 'antispam-bee' ); ?>
<span><?php _e( 'Matching the ip address with <a href="http://www.stopforumspam.com/" target="_blank" rel="noopener noreferrer">Stopforumspam</a>', 'antispam-bee' ); ?></span>
</label>
</li>
</ul>
Expand All @@ -236,42 +236,42 @@ public static function options_page() { ?>

<div class="ab-column ab-join">
<h3 class="icon advanced">
<?php esc_html_e('Advanced', 'antispam-bee') ?>
<?php esc_html_e( 'Advanced', 'antispam-bee' ); ?>
</h3>
<h6>
<?php esc_html_e('Other antispam tools', 'antispam-bee') ?>
<?php esc_html_e( 'Other antispam tools', 'antispam-bee' ); ?>
</h6>

<ul>
<li>
<input type="checkbox" name="ab_flag_spam" id="ab_flag_spam" value="1" <?php checked($options['flag_spam'], 1) ?> />
<label for="ab_flag_spam">
<?php esc_html_e('Mark as spam, do not delete', 'antispam-bee') ?>
<span><?php esc_html_e('Keep the spam in my blog.', 'antispam-bee') ?></span>
<?php esc_html_e( 'Mark as spam, do not delete', 'antispam-bee' ); ?>
<span><?php esc_html_e( 'Keep the spam in my blog.', 'antispam-bee' ); ?></span>
</label>
</li>

<li>
<input type="checkbox" name="ab_email_notify" id="ab_email_notify" value="1" <?php checked($options['email_notify'], 1) ?> />
<label for="ab_email_notify">
<?php esc_html_e('Notification by email', 'antispam-bee') ?>
<span><?php esc_html_e('Notify admins by e-mail about incoming spam', 'antispam-bee') ?></span>
<?php esc_html_e( 'Notification by email', 'antispam-bee' ); ?>
<span><?php esc_html_e( 'Notify admins by e-mail about incoming spam', 'antispam-bee' ); ?></span>
</label>
</li>

<li>
<input type="checkbox" name="ab_no_notice" id="ab_no_notice" value="1" <?php checked($options['no_notice'], 1) ?> />
<label for="ab_no_notice">
<?php esc_html_e('Not save the spam reason', 'antispam-bee') ?>
<span><?php esc_html_e('Spam reason as table column in the spam overview', 'antispam-bee') ?></span>
<?php esc_html_e( 'Not save the spam reason', 'antispam-bee' ); ?>
<span><?php esc_html_e( 'Spam reason as table column in the spam overview', 'antispam-bee' ); ?></span>
</label>
</li>

<li>
<input type="checkbox" name="ab_cronjob_enable" id="ab_cronjob_enable" value="1" <?php checked($options['cronjob_enable'], 1) ?> />
<label>
<?php echo sprintf(
esc_html__('Delete existing spam after %s days', 'antispam-bee'),
esc_html__( 'Delete existing spam after %s days', 'antispam-bee' ),
'<input type="text" name="ab_cronjob_interval" value="' .esc_attr($options['cronjob_interval']). '" class="ab-mini-field" />'
) ?>
<span><?php esc_html_e('Cleaning up the database from old entries', 'antispam-bee') ?></span>
Expand All @@ -282,7 +282,7 @@ public static function options_page() { ?>
<input type="checkbox" name="ab_ignore_filter" id="ab_ignore_filter" value="1" <?php checked($options['ignore_filter'], 1) ?> />
<label>
<?php echo sprintf(
esc_html__('Limit approval to %s', 'antispam-bee'),
esc_html__( 'Limit approval to %s', 'antispam-bee' ),
self::_build_select(
'ab_ignore_type',
array(
Expand All @@ -292,15 +292,15 @@ public static function options_page() { ?>
$options['ignore_type']
)
); ?>
<span><?php esc_html_e('Other types of spam will be deleted immediately', 'antispam-bee') ?></span>
<span><?php esc_html_e( 'Other types of spam will be deleted immediately', 'antispam-bee' ); ?></span>
</label>
</li>

<li>
<input type="checkbox" name="ab_reasons_enable" id="ab_reasons_enable" value="1" <?php checked($options['reasons_enable'], 1) ?> />
<label for="ab_reasons_enable">
<?php esc_html_e('Delete comments by spam reasons', 'antispam-bee') ?>
<span><?php esc_html_e('For multiple selections press Ctrl/CMD', 'antispam-bee') ?></span>
<?php esc_html_e( 'Delete comments by spam reasons', 'antispam-bee' ); ?>
<span><?php esc_html_e( 'For multiple selections press Ctrl/CMD', 'antispam-bee' ); ?></span>
</label>

<ul>
Expand All @@ -311,7 +311,7 @@ public static function options_page() { ?>
<?php } ?>
</select>
<label for="ab_ignore_reasons">
<?php esc_html_e('Spam Reason', 'antispam-bee') ?>
<?php esc_html_e( 'Spam Reason', 'antispam-bee' ); ?>
</label>
</li>
</ul>
Expand All @@ -322,61 +322,64 @@ public static function options_page() { ?>

<div class="ab-column ab-diff">
<h3 class="icon more">
<?php esc_html_e('More', 'antispam-bee') ?>
<?php esc_html_e( 'More', 'antispam-bee' ); ?>
</h3>
<h6>
<?php esc_html_e('A few little things', 'antispam-bee') ?>
<?php esc_html_e( 'A few little things', 'antispam-bee' ); ?>
</h6>

<ul>
<li>
<input type="checkbox" name="ab_dashboard_chart" id="ab_dashboard_chart" value="1" <?php checked($options['dashboard_chart'], 1) ?> />
<label for="ab_dashboard_chart">
<?php esc_html_e('Statistics on the dashboard', 'antispam-bee') ?>
<span><?php esc_html_e('Daily updates of spam detection rate', 'antispam-bee') ?></span>
<?php esc_html_e( 'Statistics on the dashboard', 'antispam-bee' ); ?>
<span><?php esc_html_e( 'Daily updates of spam detection rate', 'antispam-bee' ); ?></span>
</label>
</li>

<li>
<input type="checkbox" name="ab_dashboard_count" id="ab_dashboard_count" value="1" <?php checked($options['dashboard_count'], 1) ?> />
<label for="ab_dashboard_count">
<?php esc_html_e('Spam counter on the dashboard', 'antispam-bee') ?>
<span><?php esc_html_e('Amount of identified spam comments', 'antispam-bee') ?></span>
<?php esc_html_e( 'Spam counter on the dashboard', 'antispam-bee' ); ?>
<span><?php esc_html_e( 'Amount of identified spam comments', 'antispam-bee' ); ?></span>
</label>
</li>

<li>
<input type="checkbox" name="ab_ignore_pings" id="ab_ignore_pings" value="1" <?php checked($options['ignore_pings'], 1) ?> />
<label for="ab_ignore_pings">
<?php esc_html_e('Do not check trackbacks / pingbacks', 'antispam-bee') ?>
<span><?php esc_html_e('No spam check for trackback notifications', 'antispam-bee') ?></span>
<?php esc_html_e( 'Do not check trackbacks / pingbacks', 'antispam-bee' ); ?>
<span><?php esc_html_e( 'No spam check for trackback notifications', 'antispam-bee' ); ?></span>
</label>
</li>

<li>
<input type="checkbox" name="ab_always_allowed" id="ab_always_allowed" value="1" <?php checked($options['always_allowed'], 1) ?> />
<label for="ab_always_allowed">
<?php esc_html_e('Comment form used outside of posts', 'antispam-bee') ?>
<span><?php esc_html_e('Check for comment forms on archive pages', 'antispam-bee') ?></span>
<?php esc_html_e( 'Comment form used outside of posts', 'antispam-bee' ); ?>
<span><?php esc_html_e( 'Check for comment forms on archive pages', 'antispam-bee' ); ?></span>
</label>
</li>
</ul>
</div>

<div class="ab-column ab-column--service">
<?php if ( substr( get_locale(), 0, 3 ) === 'de_' ) { ?>
<p>
<a href="https://github.com/pluginkollektiv/antispam-bee/wiki/" target="_blank">Dokumentation</a>
</p>
<?php } ?>

<p>
<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=8CH5FPR88QYML" target="_blank">PayPal</a>
<a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=8CH5FPR88QYML" target="_blank" rel="noopener noreferrer"><?php esc_html_e( 'Donate', 'antispam-bee' ); ?></a>
</p>
<p>
<a href="<?php esc_html_e( 'https://wordpress.org/plugins/antispam-bee/faq/', 'antispam-bee' ); ?>" target="_blank" rel="noopener noreferrer"><?php esc_html_e( 'FAQ', 'antispam-bee' ); ?></a>
</p>
<p>
<a href="https://github.com/pluginkollektiv/antispam-bee/wiki/" target="_blank" rel="noopener noreferrer"><?php esc_html_e( 'Manual', 'antispam-bee' ); ?></a>
</p>
<p>
<a href="https://wordpress.org/support/plugin/antispam-bee" target="_blank" rel="noopener noreferrer"><?php esc_html_e( 'Support', 'antispam-bee' ); ?></a>
</p>
</div>

<div class="ab-column ab-column--submit">
<input type="submit" class="button button-primary" value="<?php _e('Save Changes', 'antispam-bee') ?>" />
<input type="submit" class="button button-primary" value="<?php esc_html_e( 'Save Changes', 'antispam-bee' ); ?>" />
</div>
</div>
</form>
Expand Down

0 comments on commit e0fdbb9

Please sign in to comment.