diff --git a/class-RegisterModule.php b/class-RegisterModule.php index 076eb94..aea01da 100644 --- a/class-RegisterModule.php +++ b/class-RegisterModule.php @@ -1,109 +1,108 @@ . /** * Dynamically inject functions in modules ("places"). * * @require DEBUG, error(), esc_html() */ class RegisterModule { /** * Assoc functions to modules */ private $module = []; /** * Constructor * * @param $defaults boolean Load the defaults modules */ function __construct( $defaults = true ) { if( $defaults ) { $this->loadDefaults(); } } /** * Get the singleton instance * * @return self */ public static function instance() { static $me = false; if( ! $me ) { $me = new self(); } return $me; } /** - * Load the default modules + * Load the default modules (scripts and styles) */ private function loadDefaults() { $this->register( 'header' ); - $this->register( 'footer' ); - - // Append scripts and styles $this->injectFunction( 'header', function () { RegisterJS ::instance()->printAll( 'header' ); RegisterCSS::instance()->printAll(); } ); + + $this->register( 'footer' ); $this->injectFunction( 'footer', function () { RegisterJS::instance()->printAll( 'footer' ); } ); } /** * Formally register a module (a place where you can inject functions) * * @param string $name */ public function register( $name ) { - if( ! isset( $this->module[ $name ] ) ) { + if( empty( $this->module[ $name ] ) ) { $this->module[ $name ] = []; } } /** * Inject a callback into a module * * @param string $name Module name * @param string $callback The callback */ public function injectFunction( $name, $callback ) { - if( ! isset( $this->module[ $name ] ) ) { - return error( "can't inject in unknown module $name" ); + if( isset( $this->module[ $name ] ) ) { + $this->module[ $name ][] = $callback; + } else { + error( "can't inject in unknown module $name" ); } - $this->module[ $name ][] = $callback; } /** - * Load all the functions related to this module name. + * Load all the functions related to this module name * * @param string $name Module name */ public function loadModule( $name ) { - if( ! isset( $this->module[ $name ] ) ) { - return error( "can't load unregistered module $name" ); - } - $status = true; - foreach( $this->module[ $name ] as $callback ) { - $status = $status && $callback(); + if( isset( $this->module[ $name ] ) ) { + foreach( $this->module[ $name ] as $callback ) { + $callback(); + } + } else { + error( "can't load unregistered module $name" ); } - return $status; } }