[Image:Improvement] Use switch statement & add minor improvements
[Image:Improvement] Use switch statement & add minor improvements

pH7Software/pH7-Social-Dating-CMS,pH7Software/pH7-Social-Dating-CMS,pH7Software/pH7-Social-Dating-CMS,pH7Software/pH7-Social-Dating-CMS