| Index: trunk/extensions/AbuseFilter/AbuseFilter.php |
| — | — | @@ -107,8 +107,3 @@ |
| 108 | 108 | $wgAbuseFilterUDPPrefix = 'abusefilter:'; |
| 109 | 109 | $wgAbuseFilterUDPAddress = null; |
| 110 | 110 | $wgAbuseFilterUDPPort = null; |
| 111 | | - |
| 112 | | -// Centralised filters |
| 113 | | -$wgAbuseFilterCentralDB = null; |
| 114 | | -$wgAbuseFilterIsCentral = false; |
| 115 | | - |
| Index: trunk/extensions/AbuseFilter/Views/AbuseFilterViewList.php |
| — | — | @@ -153,9 +153,7 @@ |
| 154 | 154 | 'tables' => array('abuse_filter', 'abuse_filter_action'), |
| 155 | 155 | 'fields' => array( |
| 156 | 156 | 'af_id', |
| 157 | | - 'af_enabled', |
| 158 | | - 'af_deleted', |
| 159 | | - 'af_global', |
| | 157 | + '(af_enabled | af_deleted << 1) AS status', |
| 160 | 158 | 'af_public_comments', |
| 161 | 159 | 'af_hidden', |
| 162 | 160 | 'af_hit_count', |
| — | — | @@ -222,19 +220,12 @@ |
| 223 | 221 | } |
| 224 | 222 | return htmlspecialchars( implode( ', ', $displayActions ) ); |
| 225 | 223 | case 'status': |
| 226 | | - $statuses = array(); |
| 227 | | - if ($row->af_deleted) |
| 228 | | - $statuses[] = wfMsgExt( 'abusefilter-deleted', 'parseinline' ); |
| 229 | | - elseif ($row->af_enabled) |
| 230 | | - $statuses[] = wfMsgExt( 'abusefilter-enabled', 'parseinline' ); |
| | 224 | + if ($value & 2) |
| | 225 | + return wfMsgExt( 'abusefilter-deleted', 'parseinline' ); |
| | 226 | + elseif ($value & 1) |
| | 227 | + return wfMsgExt( 'abusefilter-enabled', 'parseinline' ); |
| 231 | 228 | else |
| 232 | | - $statuses[] = wfMsgExt( 'abusefilter-disabled', 'parseinline' ); |
| 233 | | - |
| 234 | | - global $wgAbuseFilterIsCentral; |
| 235 | | - if ($row->af_global && $wgAbuseFilterIsCentral) |
| 236 | | - $statuses[] = wfMsgExt( 'abusefilter-status-global', 'parseinline' ); |
| 237 | | - |
| 238 | | - return $wgLang->semicolonList( $statuses ); |
| | 229 | + return wfMsgExt( 'abusefilter-disabled', 'parseinline' ); |
| 239 | 230 | case 'af_hidden': |
| 240 | 231 | $msg = $value ? 'abusefilter-hidden' : 'abusefilter-unhidden'; |
| 241 | 232 | return wfMsgExt( $msg, 'parseinline' ); |
| Index: trunk/extensions/AbuseFilter/Views/AbuseFilterViewEdit.php |
| — | — | @@ -280,10 +280,6 @@ |
| 281 | 281 | // Build checkboxen |
| 282 | 282 | $checkboxes = array( 'hidden', 'enabled', 'deleted' ); |
| 283 | 283 | $flags = ''; |
| 284 | | - |
| 285 | | - global $wgAbuseFilterIsCentral; |
| 286 | | - if ($wgAbuseFilterIsCentral) |
| 287 | | - $checkboxes[] = 'global'; |
| 288 | 284 | |
| 289 | 285 | if (isset($row->af_throttled) && $row->af_throttled) { |
| 290 | 286 | global $wgAbuseFilterEmergencyDisableThreshold; |
| — | — | @@ -586,7 +582,6 @@ |
| 587 | 583 | $obj->af_pattern = ''; |
| 588 | 584 | $obj->af_enabled = 1; |
| 589 | 585 | $obj->af_hidden = 0; |
| 590 | | - $obj->af_global = 0; |
| 591 | 586 | return array( $obj, array() ); |
| 592 | 587 | } |
| 593 | 588 | |
| — | — | @@ -646,8 +641,6 @@ |
| 647 | 642 | $row->af_deleted = $wgRequest->getBool( 'wpFilterDeleted' ); |
| 648 | 643 | $row->af_enabled = $wgRequest->getBool( 'wpFilterEnabled' ) && !$row->af_deleted; |
| 649 | 644 | $row->af_hidden = $wgRequest->getBool( 'wpFilterHidden' ); |
| 650 | | - global $wgAbuseFilterIsCentral; |
| 651 | | - $row->af_global = $wgRequest->getBool( 'wpFilterGlobal' ) && $wgAbuseFilterIsCentral; |
| 652 | 645 | |
| 653 | 646 | // Actions |
| 654 | 647 | global $wgAbuseFilterAvailableActions; |
| Index: trunk/extensions/AbuseFilter/AbuseFilter.i18n.php |
| — | — | @@ -118,7 +118,6 @@ |
| 119 | 119 | 'abusefilter-tools' => 'Abuse filter tools', |
| 120 | 120 | 'abusefilter-loglink' => 'View the abuse log', |
| 121 | 121 | 'abusefilter-return' => 'Return to filter management', |
| 122 | | - 'abusefilter-status-global' => 'Global', |
| 123 | 122 | |
| 124 | 123 | // Options form |
| 125 | 124 | 'abusefilter-list-options' => 'Options', |
| — | — | @@ -205,7 +204,6 @@ |
| 206 | 205 | 'abusefilter-edit-revert' => 'Revert actions taken by this filter', |
| 207 | 206 | 'abusefilter-edit-tools' => 'Tools:', |
| 208 | 207 | 'abusefilter-edit-test-link' => 'Test this filter against recent edits', |
| 209 | | - 'abusefilter-edit-global' => 'Apply this filter globally', |
| 210 | 208 | |
| 211 | 209 | // Filter editing helpers |
| 212 | 210 | 'abusefilter-edit-builder-select' => 'Select an option to add it at the cursor', |