Bug 18506: (QA follow-up) Indentation and more conditionals

Bug 18506: (QA follow-up) Indentation and more conditionals

Indentation fixes for readability

Cleaned up a few places where the ability to login otherwise was leakign through

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
JD amended patch: Remove trailing spaces

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit a5e8a2d0adcfeecc2ee0b62fb53ae0c7e1488626)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>