function wfRecordUpload( $name, $oldver, $size, $desc )
{
global $wgUser, $wgLang, $wgTitle, $wgOut, $wgDeferredUpdateList;
+ global $wgUseCopyrightUpload , $wpUploadCopyStatus , $wpUploadSource ;
+
$fname = "wfRecordUpload";
$sql = "SELECT img_name,img_size,img_timestamp,img_description,img_user," .
$now = wfTimestampNow();
$won = wfInvertTimestamp( $now );
+ if ( $wgUseCopyrightUpload )
+ {
+ $textdesc = "== " . wfMsg ( "filedesc" ) . " ==\n" . $desc . "\n" .
+ "== " . wfMsg ( "filestatus" ) . " ==\n" . $wpUploadCopyStatus . "\n" .
+ "== " . wfMsg ( "filesource" ) . " ==\n" . $wpUploadSource ;
+ }
+ else $textdesc = $desc ;
+
if ( 0 == wfNumRows( $res ) ) {
$sql = "INSERT INTO image (img_name,img_size,img_timestamp," .
"img_description,img_user,img_user_text) VALUES ('" .
"cur_comment,cur_user,cur_user_text,cur_timestamp,cur_is_new," .
"cur_text,inverse_timestamp,cur_touched) VALUES (" .
$common .
- ",'" . wfStrencode( $desc ) . "','{$won}','{$now}')";
+ ",'" . wfStrencode( $textdesc ) . "','{$won}','{$now}')";
wfQuery( $sql, $fname );
$id = wfInsertId() or 0; # We should throw an error instead
$sql = "INSERT INTO recentchanges (rc_namespace,rc_title,
global $HTTP_POST_FILES, $wgUploadDirectory;
global $wpUploadSaveName, $wpUploadTempName, $wpUploadSize;
global $wgSavedFile, $wgUploadOldVersion, $wpUploadOldVersion;
+ global $wgUseCopyrightUpload , $wpUploadCopyStatus , $wpUploadSource ;
+
+ if ( $wgUseCopyrightUpload )
+ {
+ $wpUploadAffirm = 1 ;
+ if ( trim ( $wpUploadCopyStatus ) == "" || trim ( $wpUploadSource ) == "" )
+ $wpUploadAffirm = 0 ;
+ }
if ( 1 != $wpUploadAffirm ) {
mainUploadForm( WfMsg( "noaffirmation" ) );
global $wgOut, $wgUser, $wgLang, $wgUploadDirectory;
global $wpUpload, $wpUploadAffirm, $wpUploadFile;
global $wpUploadDescription, $wpIgnoreWarning;
+ global $wgUseCopyrightUpload , $wpUploadSource , $wpUploadCopyStatus ;
if ( "" != $msg ) {
$sub = wfMsg( "uploaderror" );
$iw = wfMsg( "ignorewarning" );
$action = wfLocalUrl( $wgLang->specialPage( "Upload" ) );
+
+ $source = "
+<td align=right>
+<input tabindex=3 type=checkbox name=\"wpUploadAffirm\" value=\"1\" id=\"wpUploadAffirm\">
+</td><td align=left><label for=\"wpUploadAffirm\">{$ca}</label></td>
+" ;
+ if ( $wgUseCopyrightUpload )
+ {
+ $source = "
+<td align=right nowrap>" . wfMsg ( "filestatus" ) . ":</td>
+<td><input tabindex=3 type=text name=\"wpUploadCopyStatus\" value=\"" .
+htmlspecialchars($wpUploadCopyStatus). "\" size=40></td>
+</tr><tr>
+<td align=right>". wfMsg ( "filesource" ) . ":</td>
+<td><input tabindex=4 type=text name=\"wpUploadSource\" value=\"" .
+htmlspecialchars($wpUploadSource). "\" size=40></td>
+" ;
+ }
+
$wgOut->addHTML( "
<form id=\"upload\" method=\"post\" enctype=\"multipart/form-data\"
action=\"{$action}\">
<input tabindex=2 type=text name=\"wpUploadDescription\" value=\""
. htmlspecialchars( $wpUploadDescription ) . "\" size=40>
</td></tr><tr>
-<td align=right>
-<input tabindex=3 type=checkbox name=\"wpUploadAffirm\" value=\"1\" id=\"wpUploadAffirm\">
-</td><td align=left><label for=\"wpUploadAffirm\">{$ca}</label></td></tr>
+{$source}
+</tr>
<tr><td> </td><td align=left>
<input tabindex=5 type=submit name=\"wpUpload\" value=\"{$ulb}\">
</td></tr></table></form>\n" );
",
"filename" => "Filename",
"filedesc" => "Summary",
+"filestatus" => "Copyright status",
+"filesource" => "Source",
"affirmation" => "I affirm that the copyright holder of this file
agrees to license it under the terms of the $1.",
"copyrightpage" => "Wikipedia:Copyrights",
"uploadlogtext" => "Hochgeladene und gelöschte Dateien werden im $1 verzeichnet.",
"filename" => "Dateiname",
"filedesc" => "Beschreibung",
+"filestatus" => "Copyright-Status",
+"filesource" => "Quelle",
"affirmation" => "Hiermit bestätige ich, dass ich das Copyright dieser Datei habe, und diese hiermit unter $1 veröffentliche, bzw. dass die Datei 'Public Domain' ist.",
"copyrightpage" => "Wikipedia:Copyright",
"copyrightpagename" => "Wikipedia copyright",