eventespresso / event-espresso-core

core/db_models/EEM_Soft_Delete_Base.model.php

Doc Comments +3 added lines, -3 removed lines

@@ -243,7 +243,7 @@ 
 	 * @param boolean $allow_blocking if TRUE, matched objects will only be deleted if there is no related model info
 	 * that blocks it (ie, there' sno other data that depends on this data); if false, deletes regardless of other objects
 	 * which may depend on it. Its generally advisable to always leave this as TRUE, otherwise you could easily corrupt your DB
-	 * @return boolean success
+	 * @return integer success
 	 */
 	public function delete_permanently($query_params = array(), $allow_blocking = true){
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
@@ -258,7 +258,7 @@ 
 	 * @param boolean $allow_blocking if TRUE, matched objects will only be deleted if there is no related model info
 	 * that blocks it (ie, there' sno other data that depends on this data); if false, deletes regardless of other objects
 	 * which may depend on it. Its generally advisable to always leave this as TRUE, otherwise you could easily corrupt your DB
-	 * @return boolean success
+	 * @return integer success
 	 */
 	public function delete_permanently_by_ID($ID=FALSE, $allow_blocking = true){
 		$query_params = array();
@@ -352,7 +352,7 @@ 
 	/**
 	 * Updates all the items of this model which match the $query params, regardless of whether
 	 * they've been soft-deleted or not
-	 * @param array $field_n_values like EEM_Base::update's $fields_n_value
+	 * @param array $fields_n_values like EEM_Base::update's $fields_n_value
 	 * @param array $query_params like EEM_base::get_all's $query_params
 	 * @param boolean $keep_model_objs_in_sync if TRUE, makes sure we ALSO update model objects
 	 * in this model's entity map according to $fields_n_values that match $query_params. This

Braces +4 added lines, -2 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * EEH_URL helper
  * Helper class for URL-related PHP functions
@@ -62,7 +64,7 @@ 
 				isset($results['response']['code']) &&
 				$results['response']['code'] == '200'){
 			return true;
-		}else{
+		} else{
 			return false;
 		}
 	}

Spacing +48 added lines, -48 removed lines

@@ -1,5 +1,5 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
-require_once( EE_MODELS . 'EEM_Base.model.php');
+require_once(EE_MODELS.'EEM_Base.model.php');
 /**
  * EEM_Soft_Delete_Base
  *
@@ -25,14 +25,14 @@ 
  * @subpackage		includes/models/
  * @author				Michael Nelson
  */
-abstract class EEM_Soft_Delete_Base extends EEM_Base{
+abstract class EEM_Soft_Delete_Base extends EEM_Base {
 
 	/**
 	 * @param null $timezone
 	 */
 	protected function __construct($timezone = NULL) {
-		require_once( EE_MODELS . 'strategies/EE_Soft_Delete_Where_Conditions.strategy.php');
-		if( ! $this->_default_where_conditions_strategy){
+		require_once(EE_MODELS.'strategies/EE_Soft_Delete_Where_Conditions.strategy.php');
+		if ( ! $this->_default_where_conditions_strategy) {
 			$this->_default_where_conditions_strategy = new EE_Soft_Delete_Where_Conditions();
 		}
 		parent::__construct($timezone);
@@ -43,12 +43,12 @@ 
 	 * @return string
 	 * @throws EE_Error
 	 */
-	public function deleted_field_name(){
+	public function deleted_field_name() {
 		$field = $this->get_a_field_of_type('EE_Trashed_Flag_Field');
-		if($field){
+		if ($field) {
 			return $field->get_name();
-		}else{
-			throw new EE_Error(sprintf(__('We are trying to find the deleted flag field on %s, but none was found. Are you sure there is a field of type EE_Trashed_Flag_Field in %s constructor?','event_espresso'),get_class($this),get_class($this)));
+		} else {
+			throw new EE_Error(sprintf(__('We are trying to find the deleted flag field on %s, but none was found. Are you sure there is a field of type EE_Trashed_Flag_Field in %s constructor?', 'event_espresso'), get_class($this), get_class($this)));
 		}
 	}
 
@@ -59,7 +59,7 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return EE_Soft_Delete_Base_Class[]
 	 */
-	public function get_all($query_params = array()){
+	public function get_all($query_params = array()) {
 		return parent::get_all($query_params);
 	}
 
@@ -69,7 +69,7 @@ 
 	 * @param array $query_params like EEM_Base::get_all's $query_params
 	 * @return EE_Soft_Delete_Base_Class
 	 */
-	public function get_one($query_params = array()){
+	public function get_one($query_params = array()) {
 		return parent::get_one($query_params);
 	}
 	/**
@@ -77,7 +77,7 @@ 
 	 * @param array $query_params like EEM_Base::get_all's $query_params
 	 * @return EE_Soft_Delete_Base_Class
 	 */
-	public function get_one_deleted($query_params = array()){
+	public function get_one_deleted($query_params = array()) {
 		$query_params = $this->_alter_query_params_so_only_trashed_items_included($query_params);
 		return parent::get_one($query_params);
 	}
@@ -87,7 +87,7 @@ 
 	 * @param array $query_params like EEM_base::get_all's $query_params
 	 * @return EE_Soft_Delete_Base_Class
 	 */
-	public function get_one_deleted_or_undeleted($query_params = array()){
+	public function get_one_deleted_or_undeleted($query_params = array()) {
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
 		return parent::get_one($query_params);
 	}
@@ -108,7 +108,7 @@ 
 	 * @param int|string $id
 	 * @return EE_Soft_Delete_Base_Class
 	 */
-	public function get_one_by_ID_but_ignore_deleted($id){
+	public function get_one_by_ID_but_ignore_deleted($id) {
 		return parent::get_one_by_ID($id);
 	}
 	/**
@@ -119,7 +119,7 @@ 
 	 * @param boolean $distinct
 	 * @return int count
 	 */
-	public function count($query_params = array(), $field_to_count = null, $distinct = false){
+	public function count($query_params = array(), $field_to_count = null, $distinct = false) {
 		//just calls parent, but changes PHP docs for this function
 		return parent::count($query_params, $field_to_count, $distinct);
 	}
@@ -131,7 +131,7 @@ 
 	 * @param bool 	 $distinct if we want to only count the distinct values for the column then you can trigger that by the setting $distinct to TRUE;
 	 * @return int
 	 */
-	public function count_deleted($query_params = null, $field_to_count = null, $distinct = FALSE){
+	public function count_deleted($query_params = null, $field_to_count = null, $distinct = FALSE) {
 		$query_params = $this->_alter_query_params_so_only_trashed_items_included($query_params);
 		return parent::count($query_params, $field_to_count, $distinct);
 	}
@@ -141,9 +141,9 @@ 
 	 * @param array $query_params like EEM_Base::get_all's $query_params
 	 * @return array like EEM_Base::get_all's $query_params
 	 */
-	protected function _alter_query_params_so_only_trashed_items_included($query_params){
-		$deletedFlagFieldName=$this->deleted_field_name();
-		$query_params[0][$deletedFlagFieldName]=true;
+	protected function _alter_query_params_so_only_trashed_items_included($query_params) {
+		$deletedFlagFieldName = $this->deleted_field_name();
+		$query_params[0][$deletedFlagFieldName] = true;
 		return $query_params;
 	}
 
@@ -152,7 +152,7 @@ 
 	 * @param array $query_params
 	 * @return array
 	 */
-	public function alter_query_params_so_deleted_and_undeleted_items_included($query_params){
+	public function alter_query_params_so_deleted_and_undeleted_items_included($query_params) {
 		return $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
 	}
 
@@ -161,7 +161,7 @@ 
 	 * @param array $query_params
 	 * @return array
 	 */
-	protected function _alter_query_params_so_deleted_and_undeleted_items_included($query_params){
+	protected function _alter_query_params_so_deleted_and_undeleted_items_included($query_params) {
 		$query_params['default_where_conditions'] = 'other_models_only';
 		return $query_params;
 	}
@@ -173,9 +173,9 @@ 
 	 * @param bool 	 $distinct if we want to only count the distinct values for the column then you can trigger that by the setting $distinct to TRUE;
 	 * @return int
 	 */
-	public function count_deleted_and_undeleted($query_params = null, $field_to_count = null, $distinct = FALSE){
+	public function count_deleted_and_undeleted($query_params = null, $field_to_count = null, $distinct = FALSE) {
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
-		return parent::count($query_params,$field_to_count, $distinct);
+		return parent::count($query_params, $field_to_count, $distinct);
 	}
 
 	/**
@@ -184,9 +184,9 @@ 
 	 * @param string $field_to_sum name of field
 	 * @return int count
 	 */
-	public function sum($query_params =null,$field_to_sum= null){
+	public function sum($query_params = null, $field_to_sum = null) {
 		//just calls parent, but changes PHP doc
-		return parent::sum($query_params,$field_to_sum);
+		return parent::sum($query_params, $field_to_sum);
 	}
 
 
@@ -196,7 +196,7 @@ 
 	 * @param string $field_to_sum
 	 * @return int
 	 */
-	public function sum_deleted($query_params = null, $field_to_sum = null){
+	public function sum_deleted($query_params = null, $field_to_sum = null) {
 		$query_params = $this->_alter_query_params_so_only_trashed_items_included($query_params);
 		return parent::sum($query_params, $field_to_sum);
 	}
@@ -207,7 +207,7 @@ 
 	 * @param string $field_to_sum
 	 * @reutrn int
 	 */
-	public function sum_deleted_and_undeleted($query_params = null, $field_to_sum = null){
+	public function sum_deleted_and_undeleted($query_params = null, $field_to_sum = null) {
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
 		parent::sum($query_params, $field_to_sum);
 	}
@@ -217,7 +217,7 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return EE_Soft_Delete_Base_Class[]
 	 */
-	public function get_all_deleted_and_undeleted($query_params = array()){
+	public function get_all_deleted_and_undeleted($query_params = array()) {
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
 		return parent::get_all($query_params);
 	}
@@ -227,7 +227,7 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return EE_Soft_Delete_Base_Class[]
 	 */
-	public function get_all_deleted($query_params = array()){
+	public function get_all_deleted($query_params = array()) {
 		$query_params = $this->_alter_query_params_so_only_trashed_items_included($query_params);
 		return parent::get_all($query_params);
 	}
@@ -245,7 +245,7 @@ 
 	 * which may depend on it. Its generally advisable to always leave this as TRUE, otherwise you could easily corrupt your DB
 	 * @return boolean success
 	 */
-	public function delete_permanently($query_params = array(), $allow_blocking = true){
+	public function delete_permanently($query_params = array(), $allow_blocking = true) {
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
 		return parent::delete($query_params, $allow_blocking);
 	}
@@ -260,7 +260,7 @@ 
 	 * which may depend on it. Its generally advisable to always leave this as TRUE, otherwise you could easily corrupt your DB
 	 * @return boolean success
 	 */
-	public function delete_permanently_by_ID($ID=FALSE, $allow_blocking = true){
+	public function delete_permanently_by_ID($ID = FALSE, $allow_blocking = true) {
 		$query_params = array();
 		$query_params[0] = array($this->get_primary_key_field()->get_name() => $ID);
 		$query_params['limit'] = 1;
@@ -274,8 +274,8 @@ 
 	 * @param mixed $ID value of the primary_key or primary_text_key
 	 * @return boolean success
 	 */
-	public function delete_by_ID($ID){
-		return $this->delete_or_restore_by_ID(true,$ID);
+	public function delete_by_ID($ID) {
+		return $this->delete_or_restore_by_ID(true, $ID);
 	}
 	/**
 	 * Restores a particular item by its ID (primary key). Ignores the fact whether the item
@@ -283,8 +283,8 @@ 
 	 * @param mixed $ID int if primary key is an int, string otherwise
 	 * @return boolean success
 	 */
-	public function restore_by_ID($ID=FALSE){
-		return $this->delete_or_restore_by_ID(false,$ID);
+	public function restore_by_ID($ID = FALSE) {
+		return $this->delete_or_restore_by_ID(false, $ID);
 	}
 	/**
 	 * For deleting or restoring a particular item. Note that this model is a SOFT-DELETABLE model! However,
@@ -293,15 +293,15 @@ 
 	 * @param mixed $ID int if primary key is an int, string otherwise
 	 * @return boolean
 	 */
-	public function delete_or_restore_by_ID($delete=true,$ID=FALSE){
-		if ( ! $ID ) {
+	public function delete_or_restore_by_ID($delete = true, $ID = FALSE) {
+		if ( ! $ID) {
 			return FALSE;
 		}
-		$primaryKeyName=$this->primary_key_name();
+		$primaryKeyName = $this->primary_key_name();
 		// retrieve a particular transaction
 		$query_params = array();
-		$query_params[0] = array( $primaryKeyName => $ID );
-		if ( $this->delete_or_restore ($delete, $query_params )) {
+		$query_params[0] = array($primaryKeyName => $ID);
+		if ($this->delete_or_restore($delete, $query_params)) {
 			return TRUE;
 		} else {
 			return FALSE;
@@ -319,7 +319,7 @@ 
 	 * @param bool  $block_deletes
 	 * @return boolean
 	 */
-	public function delete($query_params = array(), $block_deletes = false){
+	public function delete($query_params = array(), $block_deletes = false) {
 		//no matter what, we WON'T block soft deletes.
 		return $this->delete_or_restore(true, $query_params);
 	}
@@ -330,7 +330,7 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return boolean
 	 */
-	public function restore($query_params = array()){
+	public function restore($query_params = array()) {
 		return $this->delete_or_restore(false, $query_params);
 	}
 	/**
@@ -339,10 +339,10 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return boolean
 	 */
-	function delete_or_restore($delete=true,$query_params = array()){
-		$deletedFlagFieldName=$this->deleted_field_name();
+	function delete_or_restore($delete = true, $query_params = array()) {
+		$deletedFlagFieldName = $this->deleted_field_name();
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
-		if ( $this->update (array($deletedFlagFieldName=>$delete), $query_params )) {
+		if ($this->update(array($deletedFlagFieldName=>$delete), $query_params)) {
 			return TRUE;
 		} else {
 			return FALSE;
@@ -360,9 +360,9 @@ 
 	 * be aware that model objects being used could get out-of-sync with the database
 	 * @return int number of items updated
 	 */
-	public function update_deleted_and_undeleted($fields_n_values, $query_params, $keep_model_objs_in_sync = TRUE ){
+	public function update_deleted_and_undeleted($fields_n_values, $query_params, $keep_model_objs_in_sync = TRUE) {
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
-		return $this->update($fields_n_values, $query_params, $keep_model_objs_in_sync );
+		return $this->update($fields_n_values, $query_params, $keep_model_objs_in_sync);
 	}
 
 	/**
@@ -377,8 +377,8 @@ 
 	 * be aware that model objects being used could get out-of-sync with the database
 	 * @return int how many items were updated
 	 */
-	public function update($fields_n_values, $query_params, $keep_model_objs_in_sync = TRUE ){
-		return parent::update($fields_n_values,$query_params, $keep_model_objs_in_sync );
+	public function update($fields_n_values, $query_params, $keep_model_objs_in_sync = TRUE) {
+		return parent::update($fields_n_values, $query_params, $keep_model_objs_in_sync);
 	}
 
 

core/libraries/plugin_api/EE_Register_Capabilities.lib.php

Doc Comments -1 removed lines

@@ -89,7 +89,6 @@
 	 * callback for FHEE__EE_Capabilities__init_caps_map__caps filter.
 	 * Takes care of registering additional capabilities to the caps map.   Note, that this also on the initial registration ensures that new capabilities are added to existing roles.
 	 *
-	 * @param array $caps_and_cap_map The original caps map.
 	 *
 	 * @return array merged in new caps.
 	 */

Braces +6 added lines, -3 removed lines

@@ -5,7 +5,9 @@ 
  * @subpackage plugin api, capabilities
  * @since           4.5.0
  */
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 
 /**
  * Use this to register new capabilities for the EE capabilities system.
@@ -167,8 +169,9 @@ 
 
 
 	public static function deregister( $cap_reference = NULL ) {
-		if ( !empty( self::$_registry[$cap_reference] ) )
-    		unset( self::$_registry[$cap_reference] );
+		if ( !empty( self::$_registry[$cap_reference] ) ) {
+		    		unset( self::$_registry[$cap_reference] );
+		}
 		//make sure to remove the filters added by cap map objects
 		if( isset( self::$_registered_cap_maps[ $cap_reference ] ) ) {
 			if( is_array( self::$_registered_cap_maps[ $cap_reference ] ) ){

Spacing +26 added lines, -26 removed lines

@@ -40,39 +40,39 @@ 
 	 *
 	 * @return void
 	 */
-	public static function register( $cap_reference = NULL, $setup_args = array() ) {
+	public static function register($cap_reference = NULL, $setup_args = array()) {
 		//required fields MUST be present, so let's make sure they are.
-		if ( ! isset( $cap_reference ) || ! is_array( $setup_args ) || empty( $setup_args['capabilities'] ) ) {
+		if ( ! isset($cap_reference) || ! is_array($setup_args) || empty($setup_args['capabilities'])) {
 			throw new EE_Error(
-				__( 'In order to register capabilities with EE_Register_Capabilities::register, you must include a unique name to reference the capabilities being registered, plus an array containing the following keys: "capabilities".', 'event_espresso' )
+				__('In order to register capabilities with EE_Register_Capabilities::register, you must include a unique name to reference the capabilities being registered, plus an array containing the following keys: "capabilities".', 'event_espresso')
 			);
 		}
 
 		//make sure we don't register twice
-		if( isset( self::$_registry[ $cap_reference ] ) ){
+		if (isset(self::$_registry[$cap_reference])) {
 			return;
 		}
 
 		//make sure this is not registered too late or too early.
-		if ( ! did_action( 'AHEE__EE_System__load_espresso_addons' ) || did_action( 'AHEE__EE_System___detect_if_activation_or_upgrade__begin' ) ) {
-			EE_Error::doing_it_wrong( __METHOD__, sprintf( __('%s has been registered too late.  Please ensure that EE_Register_Capabilities::register has been called at some point before the "AHEE__EE_System___detect_if_activation_or_upgrade__begin" action hook has been called.', 'event_espresso'), $cap_reference ), '4.5.0' );
+		if ( ! did_action('AHEE__EE_System__load_espresso_addons') || did_action('AHEE__EE_System___detect_if_activation_or_upgrade__begin')) {
+			EE_Error::doing_it_wrong(__METHOD__, sprintf(__('%s has been registered too late.  Please ensure that EE_Register_Capabilities::register has been called at some point before the "AHEE__EE_System___detect_if_activation_or_upgrade__begin" action hook has been called.', 'event_espresso'), $cap_reference), '4.5.0');
 		}
 
 		//some preliminary sanitization and setting to the $_registry property
 		self::$_registry[$cap_reference] = array(
-			'caps' => isset( $setup_args['capabilities'] ) && is_array( $setup_args['capabilities'] ) ? $setup_args['capabilities'] : array(),
-			'cap_maps' => isset( $setup_args['capability_maps'] ) ? $setup_args['capability_maps'] : array()
+			'caps' => isset($setup_args['capabilities']) && is_array($setup_args['capabilities']) ? $setup_args['capabilities'] : array(),
+			'cap_maps' => isset($setup_args['capability_maps']) ? $setup_args['capability_maps'] : array()
 			);
 
 
 		//set initial caps (note that EE_Capabilities takes care of making sure that the caps get added donly once)
-		add_filter( 'FHEE__EE_Capabilities__init_caps_map__caps', array( 'EE_Register_Capabilities', 'register_capabilities' ), 10 );
+		add_filter('FHEE__EE_Capabilities__init_caps_map__caps', array('EE_Register_Capabilities', 'register_capabilities'), 10);
 
 		//add filter for cap maps
-		add_filter( 'FHEE__EE_Capabilities___set_meta_caps__meta_caps', array( 'EE_Register_Capabilities', 'register_cap_maps' ), 10 );
+		add_filter('FHEE__EE_Capabilities___set_meta_caps__meta_caps', array('EE_Register_Capabilities', 'register_cap_maps'), 10);
 
 		//init_role_caps to register new capabilities
-		if ( is_admin() ) {
+		if (is_admin()) {
 			EE_Registry::instance()->load('Capabilities');
 			EE_Capabilities::instance()->init_caps();
 		}
@@ -88,9 +88,9 @@ 
 	 *
 	 * @return array merged in new caps.
 	 */
-	public static function register_capabilities( $incoming_caps ) {
-		foreach ( self::$_registry as $ref => $caps_and_cap_map ) {
-			$incoming_caps = array_merge_recursive( $incoming_caps, $caps_and_cap_map[ 'caps' ] );
+	public static function register_capabilities($incoming_caps) {
+		foreach (self::$_registry as $ref => $caps_and_cap_map) {
+			$incoming_caps = array_merge_recursive($incoming_caps, $caps_and_cap_map['caps']);
 		}
 		return $incoming_caps;
 	}
@@ -106,22 +106,22 @@ 
 	 *
 	 * @return EE_Meta_Capability_Map[]
 	 */
-	public static function register_cap_maps( $cap_maps ) {
+	public static function register_cap_maps($cap_maps) {
 		//loop through and instantiate cap maps.
-		foreach ( self::$_registry as $cap_reference => $setup ) {
-			if ( ! isset( $setup['cap_maps'] ) ) {
+		foreach (self::$_registry as $cap_reference => $setup) {
+			if ( ! isset($setup['cap_maps'])) {
 				continue;
 			}
-			foreach ( $setup['cap_maps'] as $cap_class => $args ) {
-				if ( ! class_exists( $cap_class ) ) {
-					throw new EE_Error( sprintf( __( 'An addon (%s) has tried to register a capability map improperly.  Capability map arrays must be indexed by capability map classname, and an array for the class arguments', 'event_espresso' ), $cap_reference ) );
+			foreach ($setup['cap_maps'] as $cap_class => $args) {
+				if ( ! class_exists($cap_class)) {
+					throw new EE_Error(sprintf(__('An addon (%s) has tried to register a capability map improperly.  Capability map arrays must be indexed by capability map classname, and an array for the class arguments', 'event_espresso'), $cap_reference));
 				}
 
-				if ( count( $args ) !== 2 ) {
-					throw new EE_Error( sprintf( __('An addon (%s) has tried to register a capability map improperly.  Capability map arrays must be indexed by capability map classname, and an array for the class arguments.  The array should have two values the first being a string and the second an array.', 'event_espresso' ), $cap_reference ) );
+				if (count($args) !== 2) {
+					throw new EE_Error(sprintf(__('An addon (%s) has tried to register a capability map improperly.  Capability map arrays must be indexed by capability map classname, and an array for the class arguments.  The array should have two values the first being a string and the second an array.', 'event_espresso'), $cap_reference));
 				}
 
-				$cap_maps[] = new $cap_class( $args[0], $args[1] );
+				$cap_maps[] = new $cap_class($args[0], $args[1]);
 			}
 		}
 		return $cap_maps;
@@ -130,8 +130,8 @@ 
 
 
 
-	public static function deregister( $cap_reference = NULL ) {
-		if ( !empty( self::$_registry[$cap_reference] ) )
-    		unset( self::$_registry[$cap_reference] );
+	public static function deregister($cap_reference = NULL) {
+		if ( ! empty(self::$_registry[$cap_reference]))
+    		unset(self::$_registry[$cap_reference]);
 	}
 }

Indentation +1 added lines, -1 removed lines

@@ -132,6 +132,6 @@
 
 	public static function deregister( $cap_reference = NULL ) {
 		if ( !empty( self::$_registry[$cap_reference] ) )
-    		unset( self::$_registry[$cap_reference] );
+			unset( self::$_registry[$cap_reference] );
 	}
 }

admin_pages/about/templates/credits.template.php

Spacing +15 added lines, -15 removed lines

@@ -3,7 +3,7 @@ 
 <ul class="wp-people-group" id="ee-people-group-owners">
 	<li class="wp-person" id="ee-person-sshoultes">
 		<a href="<?php esp_gravatar_profile('seth@eventespresso.com'); ?>">
-			<?php echo esp_gravatar_image( 'seth@eventespresso.com', 'Seth Shoultes' ); ?>
+			<?php echo esp_gravatar_image('seth@eventespresso.com', 'Seth Shoultes'); ?>
 		</a>
 		<a class="web" href="<?php esp_gravatar_profile('seth@eventespresso.com'); ?>">
 			Seth Shoultes
@@ -12,7 +12,7 @@ 
 	</li>
 	<li class="wp-person" id="ee-person-gkoyle">
 		<a href="<?php esp_gravatar_profile('garth@eventespresso.com'); ?>">
-			<?php echo esp_gravatar_image( 'garth@eventespresso.com', 'Garth Koyle' ); ?>
+			<?php echo esp_gravatar_image('garth@eventespresso.com', 'Garth Koyle'); ?>
 		</a>
 		<a class="web" href="<?php esp_gravatar_profile('garth@eventespresso.com'); ?>">
 			Garth Koyle
@@ -24,7 +24,7 @@ 
 <ul class="wp-people-group" id="ee-people-group-core-developers">
 	<li class="wp-person" id="ee-person-bchristensen">
 		<a href="<?php esp_gravatar_profile('brent@eventespresso.com'); ?>">
-			<?php echo esp_gravatar_image( 'brent@eventespresso.com', 'Brent Christensen' ); ?>
+			<?php echo esp_gravatar_image('brent@eventespresso.com', 'Brent Christensen'); ?>
 		</a>
 		<a class="web" href="<?php esp_gravatar_profile('brent@eventespresso.com'); ?>">
 			Brent Christensen
@@ -33,7 +33,7 @@ 
 	</li>
 	<li class="wp-person" id="ee-person-dethier">
 		<a href="<?php esp_gravatar_profile('darren@roughsmootheng.in'); ?>">
-			<?php echo esp_gravatar_image( 'darren@roughsmootheng.in', 'Darren Ethier' ); ?>
+			<?php echo esp_gravatar_image('darren@roughsmootheng.in', 'Darren Ethier'); ?>
 		</a>
 		<a class="web" href="<?php esp_gravatar_profile('darren@roughsmootheng.in'); ?>">
 			Darren Ethier
@@ -42,7 +42,7 @@ 
 	</li>
 	<li class="wp-person" id="ee-person-mnelson">
 		<a href="<?php esp_gravatar_profile('michael@eventespresso.com'); ?>">
-			<?php echo esp_gravatar_image( 'michael@eventespresso.com', 'Michael Nelson' ); ?>
+			<?php echo esp_gravatar_image('michael@eventespresso.com', 'Michael Nelson'); ?>
 		</a>
 		<a class="web" href="<?php esp_gravatar_profile('michael@eventespresso.com'); ?>">
 			Michael Nelson
@@ -54,7 +54,7 @@ 
 <ul class="wp-people-group" id="ee-people-group-support-staff">
 	<li class="wp-person" id="ee-person-jfeck">
 		<a href="<?php esp_gravatar_profile('josh@eventespresso.com'); ?>">
-			<?php echo esp_gravatar_image( 'josh@eventespresso.com', 'Josh Feck' ); ?>
+			<?php echo esp_gravatar_image('josh@eventespresso.com', 'Josh Feck'); ?>
 		</a>
 		<a class="web" href="<?php esp_gravatar_profile('josh@eventespresso.com'); ?>">
 			Josh Feck
@@ -62,7 +62,7 @@ 
 	</li>
 	<li class="wp-person" id="ee-person-drobinson">
 		<a href="<?php esp_gravatar_profile('dean@eventespresso.com'); ?>">
-			<?php echo esp_gravatar_image( 'dean@eventespresso.com', 'Dean Robinson' ); ?>
+			<?php echo esp_gravatar_image('dean@eventespresso.com', 'Dean Robinson'); ?>
 		</a>
 		<a class="web" href="<?php esp_gravatar_profile('dean@eventespresso.com'); ?>">
 			Dean Robinson
@@ -70,7 +70,7 @@ 
 	</li>
 	<li class="wp-person" id="ee-person-jwilson">
 		<a href="<?php esp_gravatar_profile('jonathan@eventespresso.com'); ?>">
-			<?php echo esp_gravatar_image( 'jonathan@eventespresso.com', 'Jonathan Wilson' ); ?>
+			<?php echo esp_gravatar_image('jonathan@eventespresso.com', 'Jonathan Wilson'); ?>
 		</a>
 		<a class="web" href="<?php esp_gravatar_profile('jonathan@eventespresso.com'); ?>">
 			Jonathan Wilson
@@ -78,7 +78,7 @@ 
 	</li>
 	<li class="wp-person" id="ee-person-sharrel">
 		<a href="<?php esp_gravatar_profile('sidney@eventespresso.com'); ?>">
-			<?php echo esp_gravatar_image( 'sidney@eventespresso.com', 'Sidney Harrell' ); ?>
+			<?php echo esp_gravatar_image('sidney@eventespresso.com', 'Sidney Harrell'); ?>
 		</a>
 		<a class="web" href="<?php esp_gravatar_profile('sidney@eventespresso.com'); ?>">
 			Sidney Harrel
@@ -86,7 +86,7 @@ 
 	</li>
 	<li class="wp-person" id="ee-person-twarwick">
 		<a href="<?php esp_gravatar_profile('tony@eventespresso.com'); ?>">
-			<?php echo esp_gravatar_image( 'tony@eventespresso.com', 'Tony Warwick' ); ?>
+			<?php echo esp_gravatar_image('tony@eventespresso.com', 'Tony Warwick'); ?>
 		</a>
 		<a class="web" href="<?php esp_gravatar_profile('tony@eventespresso.com'); ?>">
 			Tony Warwick
@@ -94,7 +94,7 @@ 
 	</li>
 	<li class="wp-person" id="ee-person-lcaum">
 		<a href="<?php esp_gravatar_profile('lorenzo@eventespresso.com'); ?>">
-			<?php echo esp_gravatar_image( 'lorenzo@eventespresso.com', 'Lorenzo Caum' ); ?>
+			<?php echo esp_gravatar_image('lorenzo@eventespresso.com', 'Lorenzo Caum'); ?>
 		</a>
 		<a class="web" href="<?php esp_gravatar_profile('lorenzo@eventespresso.com'); ?>">
 			Lorenzo Caum
@@ -104,7 +104,7 @@ 
 </ul>
 <h4 class="wp-people-group"><?php _e('Contributor Recognition', 'event_espresso'); ?></h4>
 <p class="description">
-	<?php printf( __('For every major release we want to recognize the people who contributed to the release via a Github pull request. Want to see your name listed here? %sApply for access to our github repo.%s When you submit a pull request that gets included in a major release, we\'ll add your name here linked to your Github profile.', 'event_espresso'), '<a href="http://eventespresso.com/developers/request-repo-access/">', '</a>' ); ?>
+	<?php printf(__('For every major release we want to recognize the people who contributed to the release via a Github pull request. Want to see your name listed here? %sApply for access to our github repo.%s When you submit a pull request that gets included in a major release, we\'ll add your name here linked to your Github profile.', 'event_espresso'), '<a href="http://eventespresso.com/developers/request-repo-access/">', '</a>'); ?>
 </p>
 <p class="wp-credits-list">
 	<ul>
@@ -115,7 +115,7 @@ 
 </p>
 <h4 class="wp-people-group"><?php _e('External Libraries', 'event_espresso'); ?></h4>
 <p class="description">
-	<?php printf( __('Along with the libraries %sincluded with WordPress%s, Event Espresso utilizes the following third party libraries:', 'event_espresso'), '<a href="credits.php">', '</a>' ); ?>
+	<?php printf(__('Along with the libraries %sincluded with WordPress%s, Event Espresso utilizes the following third party libraries:', 'event_espresso'), '<a href="credits.php">', '</a>'); ?>
 </p>
 <p class="wp-credits-list">
 	<a href="http://josscrowcroft.github.io/accounting.js/"><?php _e('accounting.js', 'event_espresso'); ?></a>,
@@ -131,10 +131,10 @@ 
 
 <?php
 	function esp_gravatar_profile($email) {
-		echo 'http://www.gravatar.com/' . md5($email);
+		echo 'http://www.gravatar.com/'.md5($email);
 	}
 
 	function esp_gravatar_image($email, $name) {
-		echo '<img src="http://0.gravatar.com/avatar/' . md5($email) . '?s=60" class="gravatar" alt="' . $name . '"/>';
+		echo '<img src="http://0.gravatar.com/avatar/'.md5($email).'?s=60" class="gravatar" alt="'.$name.'"/>';
 	}
 ?>

admin_pages/about/templates/ee4-overview.template.php

Spacing +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
 			<h3><?php _e('Turn your blog into a complete event registration and management system', 'event_espresso'); ?></h3>
 			<p><?php _e('Create a beautiful event page with ticket selection, venue details, and an integrated single page checkout system. With WordPress, Event Espresso, and Espresso Arabica 2014 (based on the "Twenty Fourteen" theme by WordPress), your events will certainly sell out faster than ever!', 'event_espresso'); ?></p>
 			<p><?php _e('With a striking design that does not compromise the simplicity of WordPress and Event Espresso 4, Espresso Arabica 2014 will be the best event theme on the market.', 'event_espresso'); ?></p>
-			<p><?php echo sprintf( __('%sLearn more >>%s', 'event_espresso'), '<a href="http://eventespresso.com/wiki/setup-event-espresso-arabica-theme/">', '</a>' ); ?></p>
+			<p><?php echo sprintf(__('%sLearn more >>%s', 'event_espresso'), '<a href="http://eventespresso.com/wiki/setup-event-espresso-arabica-theme/">', '</a>'); ?></p>
 		</div>
 	</div>
 	<img src="<?php echo EE_GLOBAL_ASSETS_URL; ?>images/screenshots/single-event-page.jpg">

admin_pages/events/Events_Admin_Page_Init.core.php

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *

Spacing +7 added lines, -7 removed lines

@@ -30,12 +30,12 @@ 
 
 	public function __construct() {
 		//define some events related constants
-		define( 'EVENTS_PG_SLUG', 'espresso_events' );
-		define( 'EVENTS_LABEL', __('Events', 'event_espresso'));
-		define( 'EVENTS_ADMIN', EE_ADMIN_PAGES . 'events' . DS );
-		define( 'EVENTS_ADMIN_URL', admin_url( 'admin.php?page=' . EVENTS_PG_SLUG ));
-		define( 'EVENTS_TEMPLATE_PATH', EVENTS_ADMIN . 'templates' . DS );
-		define( 'EVENTS_ASSETS_URL', EE_ADMIN_PAGES_URL . 'events/assets/' );
+		define('EVENTS_PG_SLUG', 'espresso_events');
+		define('EVENTS_LABEL', __('Events', 'event_espresso'));
+		define('EVENTS_ADMIN', EE_ADMIN_PAGES.'events'.DS);
+		define('EVENTS_ADMIN_URL', admin_url('admin.php?page='.EVENTS_PG_SLUG));
+		define('EVENTS_TEMPLATE_PATH', EVENTS_ADMIN.'templates'.DS);
+		define('EVENTS_ASSETS_URL', EE_ADMIN_PAGES_URL.'events/assets/');
 		parent::__construct();
 	}
 
@@ -44,7 +44,7 @@ 
 	}
 
 	protected function _set_menu_map() {
-		$this->_menu_map = new EE_Admin_Page_Main_Menu( array(
+		$this->_menu_map = new EE_Admin_Page_Main_Menu(array(
 			'menu_group' => 'main',
 			'menu_order' => 10,
 			'subtitle' => __('Events', 'event_espresso'),

admin_pages/events/help_tours/Event_Edit_Help_Tour.class.php

Indentation +3 added lines, -3 removed lines

@@ -123,14 +123,14 @@ 
 					'tipLocation' => 'left'
 					)
 				),
-            110 => array(
+			110 => array(
 				'id' => 'espresso_event_editor_event_options',
 				'content' => $this->_event_registration_options_stop(),
 				'options' => array(
 					'tipLocation' => 'left'
 					)
 				),
-            120 => array(
+			120 => array(
 				'id' => 'submitpost',
 				'content' => $this->_publish_event_stop(),
 				'options' => array(
@@ -196,7 +196,7 @@ 
 		return '<p>' . __('Set a feature image for your event here.', 'event_espresso') . '</p>';
 	}
     
-    protected function _publish_event_stop() {
+	protected function _publish_event_stop() {
 		return '<p>' . __('Easily control the state of your event. The main states are Published, Pending Review, and Draft. Additional states are Cancelled, Postponed, and Sold Out.', 'event_espresso') . '</p>';
 	}
 	

Spacing +15 added lines, -15 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -143,8 +143,8 @@ 
 
 
 	protected function _start() {
-		$content = '<h3>' . __('Event Editor', 'event_espresso') . '</h3>';
-		$content .= '<p>' . __('This tour of the Event Editor will provide an overview of the different areas of the screen to help you understand what they are used for. Let\'s get started on setting up your first event with Event Espresso!', 'event_espresso') . '</p>';
+		$content = '<h3>'.__('Event Editor', 'event_espresso').'</h3>';
+		$content .= '<p>'.__('This tour of the Event Editor will provide an overview of the different areas of the screen to help you understand what they are used for. Let\'s get started on setting up your first event with Event Espresso!', 'event_espresso').'</p>';
 		return $content;
 	}
 
@@ -153,51 +153,51 @@ 
 	}
 
 	protected function _event_description_stop() {
-		return '<p>' . __('The rich text editor can be used to add information about your event. Images and links can also be added along with your text.', 'event_espresso') . '</p>';
+		return '<p>'.__('The rich text editor can be used to add information about your event. Images and links can also be added along with your text.', 'event_espresso').'</p>';
 	}
 
 	protected function _event_venues_caf() {
-		return '<p>' . __('In this section, you can select the venue that is hosting your event.', 'event_espresso') . '</p>';
+		return '<p>'.__('In this section, you can select the venue that is hosting your event.', 'event_espresso').'</p>';
 	}
 
 	protected function _event_venues_stop() {
-		return '<p>' . __('In this section, you can enter information about the venue that is hosting your event.', 'event_espresso') . '</p>';
+		return '<p>'.__('In this section, you can enter information about the venue that is hosting your event.', 'event_espresso').'</p>';
 	}
 
 	protected function _event_pricing_stop() {
-		return '<p>' . __('Use the Event Datetime & Ticket section to enter details about when the event is happening and what tickets you want to offer for access to the event.', 'event_espresso') . '</p>';
+		return '<p>'.__('Use the Event Datetime & Ticket section to enter details about when the event is happening and what tickets you want to offer for access to the event.', 'event_espresso').'</p>';
 	}
 
 	protected function _event_pricing_caf() {
-		return '<p>' . __('Use the Event Datetimes & Ticket section to enter details about when the event is happening and what tickets you want to offer for access to the event.', 'event_espresso') . '</p>';
+		return '<p>'.__('Use the Event Datetimes & Ticket section to enter details about when the event is happening and what tickets you want to offer for access to the event.', 'event_espresso').'</p>';
 	}
 	
 	protected function _event_registration_options_stop() {
-		return '<p>' . __('Setup custom options for your event registration.', 'event_espresso') . '</p>';
+		return '<p>'.__('Setup custom options for your event registration.', 'event_espresso').'</p>';
 	}
 	
 	protected function _event_post_tag_stop() {
-		return '<p>' . __('Quickly add tags to your event.', 'event_espresso') . '</p>';
+		return '<p>'.__('Quickly add tags to your event.', 'event_espresso').'</p>';
 	}
 
 	protected function _event_categories_stop() {
-		return '<p>' . __('Events can also be categorized if you wish.', 'event_espresso') . '</p>';
+		return '<p>'.__('Events can also be categorized if you wish.', 'event_espresso').'</p>';
 	}
 
 	protected function _primary_question_stop_caf() {
-		return '<p>' . __('Use the questions group to request information from your primary registrant.', 'event_espresso') . '</p>';
+		return '<p>'.__('Use the questions group to request information from your primary registrant.', 'event_espresso').'</p>';
 	}
 
 	protected function _additional_questions_stop_caf() {
-		return '<p>' . __('Use the questions group to request information from your additional registrant.', 'event_espresso') . '</p>';
+		return '<p>'.__('Use the questions group to request information from your additional registrant.', 'event_espresso').'</p>';
 	}
 	
 	protected function _featured_image_stop() {
-		return '<p>' . __('Set a feature image for your event here.', 'event_espresso') . '</p>';
+		return '<p>'.__('Set a feature image for your event here.', 'event_espresso').'</p>';
 	}
     
     protected function _publish_event_stop() {
-		return '<p>' . __('Easily control the state of your event. The main states are Published, Pending Review, and Draft. Additional states are Cancelled, Postponed, and Sold Out.', 'event_espresso') . '</p>';
+		return '<p>'.__('Easily control the state of your event. The main states are Published, Pending Review, and Draft. Additional states are Cancelled, Postponed, and Sold Out.', 'event_espresso').'</p>';
 	}
 	
 }
\ No newline at end of file

Braces +2 added lines, -1 removed lines

@@ -6,8 +6,9 @@
  * @package Event Espresso
  * @subpackage messages
  */
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  *

admin_pages/messages/templates/ee_msg_m_settings_content.template.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
 	<div class"mt-settings">
 		<form method="POST" action="" class="mt-settings-form<?php echo $show_form; ?>">
 			<?php echo $template_form_fields; ?>
-			<?php foreach ( $hidden_fields as $name => $field ) {
+			<?php foreach ($hidden_fields as $name => $field) {
 				echo $field['field'];
 			} ?> 
 			<input type="submit" value="<?php _e('Submit', 'event_espresso'); ?>" class="button-secondary mt-settings-submit no-drag" />

admin_pages/registration_form/help_tours/Registration_Form_Questions_Overview_Help_Tour.class.php

Braces +2 added lines, -1 removed lines

@@ -6,8 +6,9 @@
  * @package Event Espresso
  * @subpackage messages
  */
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  *

Spacing +11 added lines, -11 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -125,34 +125,34 @@ 
 
 
 	protected function _start() {
-		$content = '<h3>' . __('Questions Overview', 'event_espresso') . '</h3>';
-		$content .= '<p>' . __('This tour of the Questions Overview page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso') . '</p>';
+		$content = '<h3>'.__('Questions Overview', 'event_espresso').'</h3>';
+		$content .= '<p>'.__('This tour of the Questions Overview page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso').'</p>';
 
 		return $content;
 	}
 
 	protected function _question_id_stop() {
-		return '<p>' . __('View the question ID. Can be sorted in ascending or descending order.', 'event_espresso') . '</p>';
+		return '<p>'.__('View the question ID. Can be sorted in ascending or descending order.', 'event_espresso').'</p>';
 	}
 
 	protected function _display_text_stop() {
-		return '<p>' . __('View available questions. You can reorder your questions by dragging and dropping them.', 'event_espresso') . '</p>';
+		return '<p>'.__('View available questions. You can reorder your questions by dragging and dropping them.', 'event_espresso').'</p>';
 	}
 
 	protected function _admin_label_stop() {
-		return '<p>' . __('View the admin label for your questions.', 'event_espresso') . '</p>';
+		return '<p>'.__('View the admin label for your questions.', 'event_espresso').'</p>';
 	}
 
 	protected function _type_stop() {
-		return '<p>' . __('View the type of question. Available options are Text, Textarea, Checkboxes, Radio Buttons, Dropdown, State/Province Dropdown, Country Dropdown, and Date Picker.', 'event_espresso') . '</p>';
+		return '<p>'.__('View the type of question. Available options are Text, Textarea, Checkboxes, Radio Buttons, Dropdown, State/Province Dropdown, Country Dropdown, and Date Picker.', 'event_espresso').'</p>';
 	}
 
 	protected function _values_stop() {
-		return '<p>' . __('View stored values for checkboxes, radio buttons, and select boxes.', 'event_espresso') . '</p>';
+		return '<p>'.__('View stored values for checkboxes, radio buttons, and select boxes.', 'event_espresso').'</p>';
 	}
 
 	protected function _required_stop() {
-		return '<p>' . __('View if a question is required.', 'event_espresso') . '</p>';
+		return '<p>'.__('View if a question is required.', 'event_espresso').'</p>';
 	}
 
 	/* protected function _bulk_actions_stop() {
@@ -160,11 +160,11 @@ 
 	} */
 
 	protected function _search_stop() {
-		return '<p>' . __('Search through questions. The following sources will be searched: Name of Question (display text).', 'event_espresso') . '</p>';
+		return '<p>'.__('Search through questions. The following sources will be searched: Name of Question (display text).', 'event_espresso').'</p>';
 	}
 
 	protected function _add_new_question_stop() {
-		return '<p>' . __('Click here to add a new question.', 'event_espresso') . '</p>';
+		return '<p>'.__('Click here to add a new question.', 'event_espresso').'</p>';
 	}
 
 }
\ No newline at end of file

admin_pages/registrations/Registrations_Admin_Page_Init.core.php

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *

Spacing +11 added lines, -11 removed lines

@@ -21,7 +21,7 @@ 
  *
  * ------------------------------------------------------------------------
  */
-class Registrations_Admin_Page_Init extends EE_Admin_Page_CPT_Init  {
+class Registrations_Admin_Page_Init extends EE_Admin_Page_CPT_Init {
 
 
 
@@ -34,16 +34,16 @@ 
 	 * 		@return void
 	 */
 	public function __construct() {
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
 
-		define( 'REG_PG_SLUG', 'espresso_registrations' );
-		define( 'REG_PG_NAME', ucwords( str_replace( '_', '', REG_PG_SLUG )));
-		define( 'REG_ADMIN', EE_ADMIN_PAGES . 'registrations' . DS );
-		define( 'REG_ADMIN_URL', admin_url( 'admin.php?page=' . REG_PG_SLUG ));
-		define( 'REG_ASSETS_PATH', REG_ADMIN . 'assets' . DS );
-		define( 'REG_ASSETS_URL', EE_ADMIN_PAGES_URL . 'registrations/assets/' );
-		define( 'REG_TEMPLATE_PATH', REG_ADMIN . 'templates' . DS );
-		define( 'REG_TEMPLATE_URL', EE_ADMIN_PAGES_URL . 'registrations/templates/' );
+		define('REG_PG_SLUG', 'espresso_registrations');
+		define('REG_PG_NAME', ucwords(str_replace('_', '', REG_PG_SLUG)));
+		define('REG_ADMIN', EE_ADMIN_PAGES.'registrations'.DS);
+		define('REG_ADMIN_URL', admin_url('admin.php?page='.REG_PG_SLUG));
+		define('REG_ASSETS_PATH', REG_ADMIN.'assets'.DS);
+		define('REG_ASSETS_URL', EE_ADMIN_PAGES_URL.'registrations/assets/');
+		define('REG_TEMPLATE_PATH', REG_ADMIN.'templates'.DS);
+		define('REG_TEMPLATE_URL', EE_ADMIN_PAGES_URL.'registrations/templates/');
 
 		parent::__construct();
 	}
@@ -58,7 +58,7 @@ 
 
 
 	protected function _set_menu_map() {
-		$this->_menu_map = new EE_Admin_Page_Sub_Menu( array(
+		$this->_menu_map = new EE_Admin_Page_Sub_Menu(array(
 			'menu_group' => 'main',
 			'menu_order' => 40,
 			'show_on_menu' => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,