| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -824,8 +824,8 @@ |
| 825 | 825 | 'destfilename', |
| 826 | 826 | 'watchthisupload', |
| 827 | 827 | 'filewasdeleted', |
| 828 | | - 'filename-prefix', |
| 829 | | - 'filename-prefix-list', |
| | 828 | + 'filename-bad-prefix', |
| | 829 | + 'filename-prefix-blacklist', |
| 830 | 830 | ), |
| 831 | 831 | 'upload-errors' => array( |
| 832 | 832 | 'upload-proto-error', |
| Index: trunk/phase3/includes/SpecialUpload.php |
| — | — | @@ -543,14 +543,12 @@ |
| 544 | 544 | } |
| 545 | 545 | } |
| 546 | 546 | |
| 547 | | - $filenamePrefix = self::getFilenamePrefix(); |
| 548 | | - if ( count( $filenamePrefix ) ) { |
| 549 | | - # Do the match |
| 550 | | - foreach( $filenamePrefix as $prefix ) { |
| 551 | | - if ( substr( $partname, 0, strlen( $prefix ) ) == $prefix ) { |
| 552 | | - $warning .= '<li>' . wfMsgExt( 'filename-prefix', 'parseinline', $prefix ) . '</li>'; |
| 553 | | - break; |
| 554 | | - } |
| | 547 | + $filenamePrefixBlacklist = self::getFilenamePrefixBlacklist(); |
| | 548 | + # Do the match |
| | 549 | + foreach( $filenamePrefixBlacklist as $prefix ) { |
| | 550 | + if ( substr( $partname, 0, strlen( $prefix ) ) == $prefix ) { |
| | 551 | + $warning .= '<li>' . wfMsgExt( 'filename-bad-prefix', 'parseinline', $prefix ) . '</li>'; |
| | 552 | + break; |
| 555 | 553 | } |
| 556 | 554 | } |
| 557 | 555 | |
| — | — | @@ -608,13 +606,14 @@ |
| 609 | 607 | } |
| 610 | 608 | |
| 611 | 609 | /** |
| 612 | | - * Get a list of filename prefixes from [[MediaWiki:filename-prefix-list]] |
| | 610 | + * Get a list of blacklisted filename prefixes from [[MediaWiki:filename-prefix-blacklist]] |
| 613 | 611 | * |
| 614 | 612 | * @return array list of prefixes |
| 615 | 613 | */ |
| 616 | | - public static function getFilenamePrefix() { |
| 617 | | - $message = wfMsgForContent( 'filename-prefix-list' ); |
| 618 | | - if( $message && !( wfEmptyMsg( 'filename-prefix-list', $message ) || $message == '-' ) ) { |
| | 614 | + public static function getFilenamePrefixBlacklist() { |
| | 615 | + $blacklist = array(); |
| | 616 | + $message = wfMsgForContent( 'filename-prefix-blacklist' ); |
| | 617 | + if( $message && !( wfEmptyMsg( 'filename-prefix-blacklist', $message ) || $message == '-' ) ) { |
| 619 | 618 | $lines = explode( "\n", $message ); |
| 620 | 619 | foreach( $lines as $line ) { |
| 621 | 620 | // Remove comment lines |
| — | — | @@ -627,12 +626,10 @@ |
| 628 | 627 | if ( $comment > 0 ) { |
| 629 | 628 | $line = substr( $line, 0, $comment-1 ); |
| 630 | 629 | } |
| 631 | | - $filenamePrefix[] = trim( $line ); |
| | 630 | + $blacklist[] = trim( $line ); |
| 632 | 631 | } |
| 633 | | - } else { |
| 634 | | - $filenamePrefix = array(); |
| 635 | 632 | } |
| 636 | | - return $filenamePrefix; |
| | 633 | + return $blacklist; |
| 637 | 634 | } |
| 638 | 635 | |
| 639 | 636 | /** |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -1422,8 +1422,8 @@ |
| 1423 | 1423 | 'destfilename' => 'Destination filename', |
| 1424 | 1424 | 'watchthisupload' => 'Watch this page', |
| 1425 | 1425 | 'filewasdeleted' => 'A file of this name has been previously uploaded and subsequently deleted. You should check the $1 before proceeding to upload it again.', |
| 1426 | | -'filename-prefix' => 'The name of the file you are uploading begins with <strong>"$1"</strong>, which is a non-descriptive name typically assigned automatically by digital cameras. Please choose a more descriptive name for your file.', |
| 1427 | | -'filename-prefix-list' => ' #<!-- leave this line exactly as it is --> <pre> |
| | 1426 | +'filename-bad-prefix' => 'The name of the file you are uploading begins with <strong>"$1"</strong>, which is a non-descriptive name typically assigned automatically by digital cameras. Please choose a more descriptive name for your file.', |
| | 1427 | +'filename-prefix-blacklist' => ' #<!-- leave this line exactly as it is --> <pre> |
| 1428 | 1428 | # Syntax is as follows: |
| 1429 | 1429 | # * Everything from a "#" character to the end of the line is a comment |
| 1430 | 1430 | # * Every non-blank line is a prefix for typical file names assigned automatically by digital cameras |
| Index: trunk/phase3/languages/messages/MessagesDa.php |
| — | — | @@ -1045,7 +1045,7 @@ |
| 1046 | 1046 | 'destfilename' => 'Målnavn', |
| 1047 | 1047 | 'watchthisupload' => 'Overvåge denne side', |
| 1048 | 1048 | 'filewasdeleted' => 'En fil med dette navn er tidligere uploadet og i mellemtiden slettet igen. Kontroller først indførslen i $1, før du gemmer filen.', |
| 1049 | | -'filename-prefix' => 'Navnet på filen du er ved at lægge op begynder med <strong>"$1"</strong>. Dette er et ikkebeskrivende navn, der typisk er skabt automatisk af et digitalkamera. Vær venlig at vælge et mere beskrivende navn på dit billede.', |
| | 1049 | +'filename-bad-prefix' => 'Navnet på filen du er ved at lægge op begynder med <strong>"$1"</strong>. Dette er et ikkebeskrivende navn, der typisk er skabt automatisk af et digitalkamera. Vær venlig at vælge et mere beskrivende navn på dit billede.', |
| 1050 | 1050 | |
| 1051 | 1051 | 'upload-proto-error' => 'Forkert protokol', |
| 1052 | 1052 | 'upload-proto-error-text' => 'Adressen skal begynde med <code>http://</code> eller <code>ftp://</code>.', |
| Index: trunk/phase3/languages/messages/MessagesDe.php |
| — | — | @@ -1073,7 +1073,7 @@ |
| 1074 | 1074 | 'destfilename' => 'Zielname', |
| 1075 | 1075 | 'watchthisupload' => 'Diese Seite beobachten', |
| 1076 | 1076 | 'filewasdeleted' => 'Eine Datei mit diesem Namen wurde schon einmal hochgeladen und zwischenzeitlich wieder gelöscht. Bitte prüfe zuerst den Eintrag im $1, bevor du die Datei wirklich speicherst.', |
| 1077 | | -'filename-prefix' => 'Der Dateiname beginnt mit <strong>„$1“</strong>. Dies ist im allgemeinen der von einer Digitalkamera vorgegebener Dateiname und daher nicht sehr aussagekräftig. |
| | 1077 | +'filename-bad-prefix' => 'Der Dateiname beginnt mit <strong>„$1“</strong>. Dies ist im allgemeinen der von einer Digitalkamera vorgegebener Dateiname und daher nicht sehr aussagekräftig. |
| 1078 | 1078 | Bitte gebe der Datei einen Namen, der den Inhalt besser beschreibt.', |
| 1079 | 1079 | |
| 1080 | 1080 | 'upload-proto-error' => 'Falsches Protokoll', |