Separate out the conditions so they can be tested properly. Reflects changes made in AdminHandler.
Separate out the conditions so they can be tested properly. Reflects changes made in AdminHandler.

git-svn-id: d0e296eae3c99886147898d36662a67893ae90b2@3905 653ae4dd-d31e-0410-96ef-6bf7bf53c507

dragonmantank/Habari,dragonmantank/Habari,dragonmantank/Habari