Neither of these are true according to this article in the Argus.
http://www.theargus.co.uk/sport/14605910.Calderon_has_hopes_of_Championship_deal___but_it_s_a_tough_summer/?ref=mr&lp=5
Calderon was speculatively linked to Charlton soon after the season ended. He has confirmed he has one offer...