| Index: trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.i18n.php |
| — | — | @@ -39,8 +39,9 @@ |
| 40 | 40 | 'articlefeedbackv5-error-flagging' => 'Error flagging feedback.', |
| 41 | 41 | |
| 42 | 42 | // Article Feedback special page. |
| | 43 | + 'articlefeedbackv5-form-tools-label' => 'Tools', |
| 43 | 44 | 'articlefeedbackv5-form-helpful-label' => 'Is this feedback helpful?', |
| 44 | | - 'articlefeedbackv5-special-add-feedback' => 'Add Your feedback', |
| | 45 | + 'articlefeedbackv5-special-add-feedback' => 'Add your feedback', |
| 45 | 46 | 'articlefeedbackv5-special-filter-visible' => 'Visible', |
| 46 | 47 | 'articlefeedbackv5-special-filter-invisible' => 'Invisible', |
| 47 | 48 | 'articlefeedbackv5-special-filter-all' => 'All', |
| Index: trunk/extensions/ArticleFeedbackv5/ArticleFeedbackv5.php |
| — | — | @@ -15,6 +15,10 @@ |
| 16 | 16 | |
| 17 | 17 | /* Configuration */ |
| 18 | 18 | |
| | 19 | +// How long text-based feedback is allowed to be before returning an error. |
| | 20 | +// Set to 0 to disable length checking entirely. |
| | 21 | +$wgArticleFeedbackv5MaxCommentLength = 0; |
| | 22 | + |
| 19 | 23 | // How long to keep ratings in the squids (they will also be purged when needed) |
| 20 | 24 | $wgArticleFeedbackv5SMaxage = 2592000; |
| 21 | 25 | |
| Index: trunk/extensions/ArticleFeedbackv5/api/ApiArticleFeedbackv5.php |
| — | — | @@ -189,6 +189,9 @@ |
| 190 | 190 | private function validateText( &$value, $pageId ) { |
| 191 | 191 | global $wgArticleFeedbackv5MaxCommentLength; |
| 192 | 192 | $title = Title::newFromID( $pageId ); |
| | 193 | + $filter_error = 0; # TODO |
| | 194 | + $spam_error = 0; # TODO |
| | 195 | + $length_error = 0; |
| 193 | 196 | |
| 194 | 197 | # Apparently this returns either true or an error message? |
| 195 | 198 | # http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/AbuseFilter/AbuseFilter.class.php?view=markup |
| — | — | @@ -198,15 +201,14 @@ |
| 199 | 202 | # $filter_error = AbuseFilter::filterAction( $vars, $title ); |
| 200 | 203 | # $filter_error = ( $filter_error === true ? 1 : 0 ); |
| 201 | 204 | |
| 202 | | - $filter_error = 0; # TODO |
| 203 | | - $spam_error = 0; # TODO |
| | 205 | + # SpamBlacklist filtering goes here. (TODO) |
| 204 | 206 | |
| 205 | 207 | # Not actually a requirement, but I can see this being a thing, |
| 206 | 208 | # not letting people post the entire text of 1984 in a comment |
| 207 | 209 | # or something like that. |
| 208 | | - $length_error = 0; |
| 209 | | - if( isset( $wgArticleFeedbackv5MaxCommentLength ) ) { |
| 210 | | - $length_error = strlen( $value ) > $wgArticleFeedbackv5MaxCommentLength ? 1 : 0; |
| | 210 | + if( $wgArticleFeedbackv5MaxCommentLength > 0 |
| | 211 | + && strlen( $value ) > $wgArticleFeedbackv5MaxCommentLength ) { |
| | 212 | + $length_error = 1; |
| 211 | 213 | } |
| 212 | 214 | |
| 213 | 215 | $has_error = $filter_error + $spam_error + $length_error; |
| Index: trunk/extensions/ArticleFeedbackv5/api/ApiViewFeedbackArticleFeedbackv5.php |
| — | — | @@ -196,7 +196,7 @@ |
| 197 | 197 | .$content |
| 198 | 198 | .wfMessage( 'articlefeedbackv5-form-helpful-label' )->escaped() |
| 199 | 199 | .Html::openElement( 'div', array( 'id' => 'aft5-feedback-tools' ) ) |
| 200 | | - .Html::element( 'h3', array(), 'Tools' ) |
| | 200 | + .Html::element( 'h3', array(), wfMessage( 'articlefeedbackv5-form-tools-label' )->escaped() ) |
| 201 | 201 | .Html::openElement( 'ul' ) |
| 202 | 202 | .($can_flag ? Html::rawElement( 'li', array(), Html::element( 'a', array( |
| 203 | 203 | 'id' => "aft5-hide-link-$id", |
| Index: trunk/extensions/ArticleFeedbackv5/SpecialArticleFeedbackv5.php |
| — | — | @@ -132,20 +132,20 @@ |
| 133 | 133 | 'div', |
| 134 | 134 | array( 'id' => 'aft5-sort-filter-controls' ) |
| 135 | 135 | ) |
| 136 | | - .$this->msg( 'articlefeedbackv5-special-sort-label-before' ) |
| 137 | | - .implode( wfMessage( 'pipe-separator' )->escaped(), $sortLabels ) |
| 138 | | - .$this->msg( 'articlefeedbackv5-special-sort-label-after' ) |
| | 136 | + .$this->msg( 'articlefeedbackv5-special-sort-label-before' )->escaped() |
| | 137 | + .implode( $this->msg( 'pipe-separator' )->escaped(), $sortLabels ) |
| | 138 | + .$this->msg( 'articlefeedbackv5-special-sort-label-after' )->escaped() |
| 139 | 139 | |
| 140 | | - .$this->msg( 'articlefeedbackv5-special-filter-label-before' ) |
| | 140 | + .$this->msg( 'articlefeedbackv5-special-filter-label-before' )->escaped() |
| 141 | 141 | .$filterSelect->getHTML() |
| 142 | | - .$this->msg( 'articlefeedbackv5-special-filter-label-after' ) |
| | 142 | + .$this->msg( 'articlefeedbackv5-special-filter-label-after' )->escaped() |
| 143 | 143 | .Html::element( |
| 144 | 144 | 'a', |
| 145 | 145 | array( |
| 146 | 146 | 'href' => '#', |
| 147 | 147 | 'id' => 'articlefeedbackv5-special-add-feedback', |
| 148 | 148 | ), |
| 149 | | - $this->msg( 'articlefeedbackv5-special-add-feedback' ) |
| | 149 | + $this->msg( 'articlefeedbackv5-special-add-feedback' )->escaped() |
| 150 | 150 | ) |
| 151 | 151 | .Html::closeElement( 'div' ) |
| 152 | 152 | ); |