| Index: trunk/phase3/includes/SpecialUpload.php |
| — | — | @@ -28,7 +28,7 @@ |
| 29 | 29 | /**#@+ |
| 30 | 30 | * @access private |
| 31 | 31 | */ |
| 32 | | - var $mUploadAffirm, $mUploadFile, $mUploadDescription, $mIgnoreWarning; |
| | 32 | + var $mUploadFile, $mUploadDescription, $mIgnoreWarning; |
| 33 | 33 | var $mUploadSaveName, $mUploadTempName, $mUploadSize, $mUploadOldVersion; |
| 34 | 34 | var $mUploadCopyStatus, $mUploadSource, $mReUpload, $mAction, $mUpload; |
| 35 | 35 | var $mOname, $mSessionKey, $mStashed, $mDestFile; |
| — | — | @@ -47,7 +47,6 @@ |
| 48 | 48 | return; |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | | - $this->mUploadAffirm = $request->getCheck( 'wpUploadAffirm' ); |
| 52 | 51 | $this->mIgnoreWarning = $request->getCheck( 'wpIgnoreWarning'); |
| 53 | 52 | $this->mReUpload = $request->getCheck( 'wpReUpload' ); |
| 54 | 53 | $this->mUpload = $request->getCheck( 'wpUpload' ); |
| — | — | @@ -133,7 +132,7 @@ |
| 134 | 133 | */ |
| 135 | 134 | function processUpload() { |
| 136 | 135 | global $wgUser, $wgOut, $wgLang, $wgContLang; |
| 137 | | - global $wgUploadDirectory, $wgCopyrightAffirmation; |
| | 136 | + global $wgUploadDirectory; |
| 138 | 137 | global $wgUseCopyrightUpload, $wgCheckCopyrightUpload; |
| 139 | 138 | |
| 140 | 139 | /** |
| — | — | @@ -143,27 +142,6 @@ |
| 144 | 143 | return $this->mainUploadForm('<li>'.wfMsg( 'emptyfile' ).'</li>'); |
| 145 | 144 | } |
| 146 | 145 | |
| 147 | | - if ( !$wgCopyrightAffirmation ) |
| 148 | | - $this->mUploadAffirm = true; |
| 149 | | - /** |
| 150 | | - * When using detailed copyright, if user filled field, assume he |
| 151 | | - * confirmed the upload |
| 152 | | - */ |
| 153 | | - if ( $wgUseCopyrightUpload ) { |
| 154 | | - $this->mUploadAffirm = true; |
| 155 | | - if( $wgCheckCopyrightUpload && |
| 156 | | - ( trim( $this->mUploadCopyStatus ) == '' || |
| 157 | | - trim( $this->mUploadSource ) == '' ) ) { |
| 158 | | - $this->mUploadAffirm = false; |
| 159 | | - } |
| 160 | | - } |
| 161 | | - |
| 162 | | - /** User need to confirm his upload */ |
| 163 | | - if( !$this->mUploadAffirm ) { |
| 164 | | - $this->mainUploadForm( wfMsg( 'noaffirmation' ) ); |
| 165 | | - return; |
| 166 | | - } |
| 167 | | - |
| 168 | 146 | # Chop off any directories in the given filename |
| 169 | 147 | if ( $this->mDestFile ) { |
| 170 | 148 | $basename = basename( $this->mDestFile ); |
| — | — | @@ -500,7 +478,6 @@ |
| 501 | 479 | |
| 502 | 480 | $wgOut->addHTML( " |
| 503 | 481 | <form id='uploadwarning' method='post' enctype='multipart/form-data' action='$action'> |
| 504 | | - <input type='hidden' name='wpUploadAffirm' value='1' /> |
| 505 | 482 | <input type='hidden' name='wpIgnoreWarning' value='1' /> |
| 506 | 483 | <input type='hidden' name='wpSessionKey' value=\"" . htmlspecialchars( $this->mSessionKey ) . "\" /> |
| 507 | 484 | <input type='hidden' name='wpUploadDescription' value=\"" . htmlspecialchars( $this->mUploadDescription ) . "\" /> |
| — | — | @@ -533,7 +510,7 @@ |
| 534 | 511 | */ |
| 535 | 512 | function mainUploadForm( $msg='' ) { |
| 536 | 513 | global $wgOut, $wgUser, $wgLang, $wgUploadDirectory, $wgRequest; |
| 537 | | - global $wgUseCopyrightUpload, $wgCopyrightAffirmation; |
| | 514 | + global $wgUseCopyrightUpload; |
| 538 | 515 | |
| 539 | 516 | $cols = intval($wgUser->getOption( 'cols' )); |
| 540 | 517 | $ew = $wgUser->getOption( 'editwidth' ); |
| — | — | @@ -555,9 +532,6 @@ |
| 556 | 533 | $fd = wfMsg( 'filedesc' ); |
| 557 | 534 | $ulb = wfMsg( 'uploadbtn' ); |
| 558 | 535 | |
| 559 | | - $clink = $sk->makeKnownLink( wfMsgForContent( 'copyrightpage' ), |
| 560 | | - wfMsg( 'copyrightpagename' ) ); |
| 561 | | - $ca = wfMsg( 'affirmation', $clink ); |
| 562 | 536 | $iw = wfMsg( 'ignorewarning' ); |
| 563 | 537 | |
| 564 | 538 | $titleObj = Title::makeTitle( NS_SPECIAL, 'Upload' ); |
| — | — | @@ -566,13 +540,6 @@ |
| 567 | 541 | $encDestFile = htmlspecialchars( $this->mDestFile ); |
| 568 | 542 | $source = null; |
| 569 | 543 | |
| 570 | | - if ( $wgCopyrightAffirmation ) { |
| 571 | | - $source = " |
| 572 | | - <td align='right'> |
| 573 | | - <input tabindex='3' type='checkbox' name='wpUploadAffirm' value='1' id='wpUploadAffirm' /> |
| 574 | | - </td><td align='left'><label for='wpUploadAffirm'>{$ca}</label></td> |
| 575 | | - " ; |
| 576 | | - } |
| 577 | 544 | if ( $wgUseCopyrightUpload ) |
| 578 | 545 | { |
| 579 | 546 | $source = " |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -1117,10 +1117,6 @@ |
| 1118 | 1118 | /** Set this to some HTML to override the rights icon with an arbitrary logo */ |
| 1119 | 1119 | $wgCopyrightIcon = NULL; |
| 1120 | 1120 | |
| 1121 | | -/* Set this to true if you want the annoying copyright confirmation |
| 1122 | | - * checkbox at Special:Upload */ |
| 1123 | | -$wgCopyrightAffirmation = false; |
| 1124 | | - |
| 1125 | 1121 | /** Set this to true if you want detailed copyright information forms on Upload. */ |
| 1126 | 1122 | $wgUseCopyrightUpload = false; |
| 1127 | 1123 | |
| Index: trunk/phase3/languages/Language.php |
| — | — | @@ -1012,12 +1012,9 @@ |
| 1013 | 1013 | 'filedesc' => 'Summary', |
| 1014 | 1014 | 'filestatus' => 'Copyright status', |
| 1015 | 1015 | 'filesource' => 'Source', |
| 1016 | | -'affirmation' => "I affirm that the copyright holder of this file |
| 1017 | | -agrees to license it under the terms of the $1.", |
| 1018 | 1016 | 'copyrightpage' => "Project:Copyrights", |
| 1019 | 1017 | 'copyrightpagename' => "{{SITENAME}} copyright", |
| 1020 | 1018 | 'uploadedfiles' => 'Uploaded files', |
| 1021 | | -'noaffirmation' => 'You must affirm that your upload does not violate any copyrights.', |
| 1022 | 1019 | 'ignorewarning' => 'Ignore warning and save file anyway.', |
| 1023 | 1020 | 'minlength' => 'File names must be at least three letters.', |
| 1024 | 1021 | 'illegalfilename' => 'The filename "$1" contains characters that are not allowed in page titles. Please rename the file and try uploading it again.', |