@@ -471,16 +471,20 @@ def main(client_id, user_arguments_dict, environ=None):
471471 dialog_help = "Really accept account request %s? Optionally provide a specific user as Peer below or %s to auto-extract from request." % (
472472 req_id , keyword_auto )
473473 reject_reason = keyword_auto
474- invalid = req_dict .get ('invalid' )
475- invalid_reasons = '. ' .join (invalid )
474+ invalid = req_dict .get ('invalid' , [])
475+ # We need to append space to newlines to prevent too greedy html merge
476+ invalid_reasons = '. ' .join (invalid ).replace ('\n ' , '\n ' )
476477 if invalid :
477478 reject_reason = invalid_reasons
479+ logger .info ("request %s has invalid markers: %s" %
480+ (req_id , reject_reason ))
478481 req_item ['createaccountreqlink' ] = {
479482 'object_type' : 'link' , 'destination' :
480483 "javascript: alert('invalid request: %s');" % invalid_reasons ,
481- 'class' : 'warning iconspace' , 'title' : 'Invalid request %s' %
482- req_id , 'text' : '' }
484+ 'class' : 'warn iconspace' , 'title' : 'Request is invalid: %s' %
485+ invalid_reasons , 'text' : '' }
483486 else :
487+ logger .debug ("request %s looks valid" )
484488 req_item ['createaccountreqlink' ] = {
485489 'object_type' : 'link' , 'destination' :
486490 "javascript: confirmDialog(%s, '%s', '%s', '', '%s');" %
0 commit comments