Phase diagrams for the bond- and site-diluted transverse ising model