In this paper, a controlled-phase-flip (P-CPF) gate using the polarisation and orbital angular momentum degrees of freedom for single-photon two-qubit quantum logic is proposed. This is critical to the realisation of quantum cluster states and graph networks using transverse degrees of freedom. A generalisation of the proposed scheme to arbitrary number and kinds of degrees of freedom, for optical systems, as well as arbitrary operations to be conditionally performed is proposed.