Items marked with * are optional.'; - genHtmlTail(); + print ' +
+ Please enter only accurate information. Descriptions like "Unknown modem device" are only of a little use to anybody. + Real chip names and numbers are preferred over marketing names. In case you know both, enclose the marketing name in square brackets like in + "3c595 100BaseTX [Vortex]". Do not include names of superitems in the name (like vendor name in device name). + Check information specific to this ID type. +
+ If there is something you want to clarify about the item, you can use note (like the ID does not belong to people using it). + Discussion is for things more relevant to history of the item than the real device (like information source). + Both note and discussion is optional.'; + genHtmlFooter( 1, $req, $args ); return OK; } @@ -53,7 +79,8 @@ sub newItemSubmit( $$$$ ) { return undef; }, 'note' => sub { return ( length shift > 1024 ) ? 'Note can not be longer than 1024 characters' : undef; }, - 'discussion' => sub { return ( length shift > 1024 ) ? 'Discussion can not be longer than 1024 characters' : undef; } + 'discussion' => sub { return ( length shift > 1024 ) ? 'Discussion can not be longer than 1024 characters' : undef; }, + 'subscribe' => undef }, [ sub { my( $data ) = @_; my $errstr; return undef unless( length $data->{'id'} );#No address, so let it for the first check @@ -64,17 +91,16 @@ sub newItemSubmit( $$$$ ) { my( $result, $comName ) = $tables->submitItem( $data, $auth ); if( $result eq 'exists' ) { genHtmlHead( $req, 'ID collision', undef ); - print '
Sorry, this ID already exists.'; - genHtmlTail(); + genHtmlFooter( 0, undef, undef ); return OK; } elsif( $result ) { - die "Failed to submit new item: $result\n"; + return genNewItemForm( $req, $args, $auth, $tables, $result, $data ); } - notify( $tables, $data->{'address'}->get(), $comName, 2, 0 ); + notify( $tables, $data->{'address'}->parent()->get(), $comName, 2, 0 );#Notify the parent (parent gets new items) + $tables->submitNotification( $auth->{'authid'}, $data->{'address'}->get(), { 'recursive' => 0, 'notification' => 0, 'way' => 0 } ) if( defined $data->{'subscribe'} && $data->{'subscribe'} eq 'subscribe' ); tulog( $auth->{'authid'}, "Item created ".$data->{'address'}->get()." ".logEscape( $data->{'name'} )." ".logEscape( $data->{'note'} )." ".logEscape( $data->{'discussion'} )." $comName" ); return HTTPRedirect( $req, '/read/'.$data->{'address'}->get().'?action=list' ); } else { @@ -86,20 +112,32 @@ sub genNewHistoryForm( $$$$$$ ) { my( $req, $args, $tables, $auth, $error, $values ) = @_; my( $ok, $parent, $name, $note, $address ) = loadItem( $tables, $req->uri() ); return NOT_FOUND unless( $ok ); - my $prettyAddr = encode( $address->pretty() ); - genHtmlHead( $req, "$prettyAddr - discuss", undef ); - print "
Items marked with * are optional, use them only if you want to change the name and note.'; - print '
If you specify note, you must include name too.'; - genHtmlTail(); + print ' +
+ Please enter only accurate information. Descriptions like "Unknown modem device" are only of a little use to anybody. + Real chip names and numbers are preferred over marketing names. In case you know both, enclose the marketing name in square brackets like in + "3c595 100BaseTX [Vortex]". Do not include names of superitems in the name (like vendor name in device name). + Check information specific to this ID type. +
+ You may provide just discussion, request deletion or enter a new name and note. + Note is for clarification of the device information, discussion is for reasons, why you change it and like that. +
+ You may add discussion note to name change or deletion request too. + You must provide at last name or discussion or deletion request. +
+ If you provide note, you must provide name too.'; + genHtmlFooter( 1, $req, $args ); return OK; } @@ -123,10 +161,23 @@ sub newHistorySubmit( $$$$ ) { 'text' => sub { my( $expl ) = @_; return 'Text can not be longer than 1024 characters' if ( length $expl > 1024 ); - return 'You must provide the text of comment' unless( length $expl ); return undef; - } + }, + 'delete' => sub { + my( $delete ) = @_; + return ( undef, '0' ) unless defined $delete; + return undef if $delete eq 'delete'; + return 'Invalid form value'; + return undef; + }, + 'subscribe' => undef }, [ sub { my( $data ) = @_; + return 'You must provide either name, text or request a deletion' if( ! length $data->{'name'} && ! length $data->{'text'} && ! $data->{'delete'} ); + return undef; + }, sub { my( $data ) = @_; + return 'You can not set name and request deletion at the same time' if( length $data->{'name'} && $data->{'delete'} ); + return undef; + }, sub { my( $data ) = @_; return 'You must provide name too' if( ( length $data->{'note'} ) && ( ! length $data->{'name'} ) ); return undef; }, sub { return $address->canDiscuss() ? undef : 'You can not discuss this item'; } ] ); @@ -134,6 +185,7 @@ sub newHistorySubmit( $$$$ ) { my $hid = $tables->submitHistory( $data, $auth, $address ); tulog( $auth->{'authid'}, "Discussion created $hid ".$address->get()." ".logEscape( $data->{'name'} )." ".logEscape( $data->{'description'} )." ".logEscape( $data->{'text'} ) ); notify( $tables, $address->get(), $hid, ( defined $name && ( $name ne '' ) ) ? 1 : 0, 1 ); + $tables->submitNotification( $auth->{'authid'}, $address->get(), { 'recursive' => 0, 'notification' => 1, 'way' => 0 } ) if( defined $data->{'subscribe'} && $data->{'subscribe'} eq 'subscribe' ); return HTTPRedirect( $req, '/read/'.$address->get().'?action=list' ); } else { return notLoggedComplaint( $req, $args, $auth );