Minor - format code.
Simplifying reports see BT#7297
Minor - format code.
Merge branch '1.9.x' of ssh://github.com/chamilo/chamilo-lms into chamilo19