| @@ -3,27 +3,27 @@ | ||
| 3 | 3 |  if (!defined('EVENT_ESPRESSO_VERSION')) | 
| 4 | 4 |  	exit('No direct script access allowed'); | 
| 5 | 5 | /** | 
| 6 | - * Event Espresso | |
| 7 | - * | |
| 8 | - * Event Registration and Management Plugin for WordPress | |
| 9 | - * | |
| 10 | - * @ package Event Espresso | |
| 11 | - * @ author Seth Shoultes | |
| 12 | - * @ copyright (c) 2008-2011 Event Espresso All Rights Reserved. | |
| 13 | - * @ license http://eventespresso.com/support/terms-conditions/ * see Plugin Licensing * | |
| 14 | - * @ link http://www.eventespresso.com | |
| 15 | - * @ version 4.3 | |
| 16 | - * | |
| 17 | - * ------------------------------------------------------------------------ | |
| 18 | - * | |
| 19 | - * payment_log_details | |
| 20 | - * | |
| 21 | - * @package Event Espresso | |
| 22 | - * @subpackage | |
| 23 | - * @author Mike Nelson | |
| 24 | - * | |
| 25 | - * ------------------------------------------------------------------------ | |
| 26 | - */ | |
| 6 | + * Event Espresso | |
| 7 | + * | |
| 8 | + * Event Registration and Management Plugin for WordPress | |
| 9 | + * | |
| 10 | + * @ package Event Espresso | |
| 11 | + * @ author Seth Shoultes | |
| 12 | + * @ copyright (c) 2008-2011 Event Espresso All Rights Reserved. | |
| 13 | + * @ license http://eventespresso.com/support/terms-conditions/ * see Plugin Licensing * | |
| 14 | + * @ link http://www.eventespresso.com | |
| 15 | + * @ version 4.3 | |
| 16 | + * | |
| 17 | + * ------------------------------------------------------------------------ | |
| 18 | + * | |
| 19 | + * payment_log_details | |
| 20 | + * | |
| 21 | + * @package Event Espresso | |
| 22 | + * @subpackage | |
| 23 | + * @author Mike Nelson | |
| 24 | + * | |
| 25 | + * ------------------------------------------------------------------------ | |
| 26 | + */ | |
| 27 | 27 | /*@var EE_Change_Log $payment_Log */ | 
| 28 | 28 | /*@var EE_Payment_Method $payment_Method*/ | 
| 29 | 29 | /*@var EE_Transaction $transaction*/ | 
| @@ -1,6 +1,6 @@ discard block | ||
| 1 | 1 | <?php | 
| 2 | 2 | |
| 3 | -if (!defined('EVENT_ESPRESSO_VERSION')) | |
| 3 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) | |
| 4 | 4 |  	exit('No direct script access allowed'); | 
| 5 | 5 | /** | 
| 6 | 6 | * Event Espresso | 
| @@ -61,7 +61,7 @@ discard block | ||
| 61 | 61 | </label> | 
| 62 | 62 | </th> | 
| 63 | 63 | <td> | 
| 64 | -					<?php echo $transaction ? $transaction->ID() : __("Could not be determined", 'event_espresso');?> | |
| 64 | +					<?php echo $transaction ? $transaction->ID() : __("Could not be determined", 'event_espresso'); ?> | |
| 65 | 65 | |
| 66 | 66 | </td> | 
| 67 | 67 | </tr> | 
| @@ -72,7 +72,7 @@ discard block | ||
| 72 | 72 | </label> | 
| 73 | 73 | </th> | 
| 74 | 74 | <td> | 
| 75 | -					<?php echo $payment_log->e('LOG_message','as_table');//EEH_Template::layout_array_as_table($payment_log->content())?> | |
| 75 | +					<?php echo $payment_log->e('LOG_message', 'as_table'); //EEH_Template::layout_array_as_table($payment_log->content())?> | |
| 76 | 76 | </td> | 
| 77 | 77 | </tr> | 
| 78 | 78 | </tbody> | 
| @@ -1,7 +1,8 @@ | ||
| 1 | 1 | <?php | 
| 2 | 2 | |
| 3 | -if (!defined('EVENT_ESPRESSO_VERSION')) | |
| 3 | +if (!defined('EVENT_ESPRESSO_VERSION')) { | |
| 4 | 4 |  	exit('No direct script access allowed'); | 
| 5 | +} | |
| 5 | 6 | /** | 
| 6 | 7 | * Event Espresso | 
| 7 | 8 | * | 
| @@ -14,7 +14,7 @@ | ||
| 14 | 14 | <td> | 
| 15 | 15 | |
| 16 | 16 | <a id="activate_<?php echo $payment_method->slug()?>" class="espresso-button-green button-primary" href="<?php echo $activate_url?>"> | 
| 17 | -						<?php printf(__("Activate %s Payment Method?", "event_espresso"),$payment_method->admin_name()); ?> | |
| 17 | +						<?php printf(__("Activate %s Payment Method?", "event_espresso"), $payment_method->admin_name()); ?> | |
| 18 | 18 | </a> | 
| 19 | 19 | </td> | 
| 20 | 20 | </tr> | 
| @@ -9,7 +9,7 @@ | ||
| 9 | 9 | </label> | 
| 10 | 10 | </th> | 
| 11 | 11 | <td> | 
| 12 | -					<?php echo EEH_Form_Fields::select_input('show_pending_payment_options', $values, $show_pending_payment_options ); ?> | |
| 12 | +					<?php echo EEH_Form_Fields::select_input('show_pending_payment_options', $values, $show_pending_payment_options); ?> | |
| 13 | 13 | |
| 14 | 14 | </td> | 
| 15 | 15 | </tr> | 
| @@ -1,5 +1,5 @@ discard block | ||
| 1 | 1 | <?php | 
| 2 | -if (!defined('EVENT_ESPRESSO_VERSION') ) | |
| 2 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) | |
| 3 | 3 |  	exit('NO direct script access allowed'); | 
| 4 | 4 | |
| 5 | 5 | /** | 
| @@ -33,16 +33,16 @@ discard block | ||
| 33 | 33 | |
| 34 | 34 |  	public function __construct() { | 
| 35 | 35 | //define some constants | 
| 36 | - define( 'REGISTRATION_FORM_PG_SLUG', 'espresso_registration_form' ); | |
| 37 | -		define( 'REGISTRATION_FORM_LABEL', __('Registration Form', 'event_espresso')); | |
| 38 | - define( 'REGISTRATION_FORM_PG_NAME', REGISTRATION_FORM_LABEL ); | |
| 39 | - define( 'REGISTRATION_FORM_ADMIN', EE_ADMIN_PAGES . 'registration_form' . DS ); | |
| 40 | - define( 'REGISTRATION_FORM_ADMIN_URL', admin_url( 'admin.php?page=' . REGISTRATION_FORM_PG_SLUG )); | |
| 41 | -		define( 'EE_FORMS_ADMIN_URL', admin_url('admin.php?page=' . REGISTRATION_FORM_PG_SLUG )); | |
| 42 | - define( 'REGISTRATION_FORM_ASSETS_PATH', REGISTRATION_FORM_ADMIN . 'assets' . DS ); | |
| 43 | - define( 'REGISTRATION_FORM_ASSETS_URL', EE_ADMIN_PAGES_URL . 'registration_form/assets/' ); | |
| 44 | - define( 'REGISTRATION_FORM_TEMPLATE_PATH', REGISTRATION_FORM_ADMIN . 'templates' . DS ); | |
| 45 | - define( 'REGISTRATION_FORM_TEMPLATE_URL', EE_ADMIN_PAGES_URL . 'registration_form/templates/' ); | |
| 36 | +		define('REGISTRATION_FORM_PG_SLUG', 'espresso_registration_form'); | |
| 37 | +		define('REGISTRATION_FORM_LABEL', __('Registration Form', 'event_espresso')); | |
| 38 | +		define('REGISTRATION_FORM_PG_NAME', REGISTRATION_FORM_LABEL); | |
| 39 | +		define('REGISTRATION_FORM_ADMIN', EE_ADMIN_PAGES.'registration_form'.DS); | |
| 40 | +		define('REGISTRATION_FORM_ADMIN_URL', admin_url('admin.php?page='.REGISTRATION_FORM_PG_SLUG)); | |
| 41 | +		define('EE_FORMS_ADMIN_URL', admin_url('admin.php?page='.REGISTRATION_FORM_PG_SLUG)); | |
| 42 | +		define('REGISTRATION_FORM_ASSETS_PATH', REGISTRATION_FORM_ADMIN.'assets'.DS); | |
| 43 | +		define('REGISTRATION_FORM_ASSETS_URL', EE_ADMIN_PAGES_URL.'registration_form/assets/'); | |
| 44 | +		define('REGISTRATION_FORM_TEMPLATE_PATH', REGISTRATION_FORM_ADMIN.'templates'.DS); | |
| 45 | +		define('REGISTRATION_FORM_TEMPLATE_URL', EE_ADMIN_PAGES_URL.'registration_form/templates/'); | |
| 46 | 46 | parent::__construct(); | 
| 47 | 47 | } | 
| 48 | 48 | |
| @@ -53,7 +53,7 @@ discard block | ||
| 53 | 53 | |
| 54 | 54 | |
| 55 | 55 |  	protected function _set_menu_map() { | 
| 56 | - $this->_menu_map = new EE_Admin_Page_Sub_Menu( array( | |
| 56 | + $this->_menu_map = new EE_Admin_Page_Sub_Menu(array( | |
| 57 | 57 | 'menu_group' => 'management', | 
| 58 | 58 | 'menu_order' => 30, | 
| 59 | 59 | 'show_on_menu' => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY, | 
| @@ -1,6 +1,7 @@ | ||
| 1 | 1 | <?php | 
| 2 | -if (!defined('EVENT_ESPRESSO_VERSION') ) | |
| 2 | +if (!defined('EVENT_ESPRESSO_VERSION') ) { | |
| 3 | 3 |  	exit('NO direct script access allowed'); | 
| 4 | +} | |
| 4 | 5 | |
| 5 | 6 | /** | 
| 6 | 7 | * Event Espresso | 
| @@ -1,6 +1,7 @@ discard block | ||
| 1 | 1 | <?php | 
| 2 | -if (!defined('EVENT_ESPRESSO_VERSION') ) | |
| 2 | +if (!defined('EVENT_ESPRESSO_VERSION') ) { | |
| 3 | 3 |  	exit('NO direct script access allowed'); | 
| 4 | +} | |
| 4 | 5 | |
| 5 | 6 | /** | 
| 6 | 7 | * Event Espresso | 
| @@ -42,7 +43,7 @@ discard block | ||
| 42 | 43 |  	protected function _setup_data() { | 
| 43 | 44 |  		if(isset($this->_req_data['status'] ) && $this->_req_data['status'] == 'trash'){ | 
| 44 | 45 | $this->_data = $this->_admin_page->get_trashed_questions( $this->_per_page,$this->_current_page, FALSE ); | 
| 45 | -		}else{ | |
| 46 | +		} else{ | |
| 46 | 47 | $this->_data = $this->_admin_page->get_questions( $this->_per_page,$this->_current_page, FALSE ); | 
| 47 | 48 | } | 
| 48 | 49 | $this->_all_data_count = $this->_admin_page->get_questions( $this->_per_page,$this->_current_page, TRUE ); | 
| @@ -117,8 +118,9 @@ discard block | ||
| 117 | 118 |  	public function column_display_text(EE_Question $item) { | 
| 118 | 119 | $system_question = $item->is_system_question(); | 
| 119 | 120 | |
| 120 | -		if ( !defined('REG_ADMIN_URL') ) | |
| 121 | -			define('REG_ADMIN_URL', EVENTS_ADMIN_URL); | |
| 121 | +		if ( !defined('REG_ADMIN_URL') ) { | |
| 122 | +					define('REG_ADMIN_URL', EVENTS_ADMIN_URL); | |
| 123 | + } | |
| 122 | 124 | |
| 123 | 125 | $edit_query_args = array( | 
| 124 | 126 | 'action' => 'edit_question', | 
| @@ -152,7 +154,7 @@ discard block | ||
| 152 | 154 | $options= $item->options(); | 
| 153 | 155 |  		if(empty($options)){ | 
| 154 | 156 | return "N/A"; | 
| 155 | -		}else{ | |
| 157 | +		} else{ | |
| 156 | 158 |  			foreach($options as $optionID=>$option){ | 
| 157 | 159 | /* @var $option EE_Question_Option */ | 
| 158 | 160 | $optionNames[]=$option->value(); | 
| @@ -1,5 +1,5 @@ discard block | ||
| 1 | 1 | <?php | 
| 2 | -if (!defined('EVENT_ESPRESSO_VERSION') ) | |
| 2 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) | |
| 3 | 3 |  	exit('NO direct script access allowed'); | 
| 4 | 4 | |
| 5 | 5 | /** | 
| @@ -32,7 +32,7 @@ discard block | ||
| 32 | 32 |  class Registration_Form_Questions_Admin_List_Table extends EE_Admin_List_Table { | 
| 33 | 33 | |
| 34 | 34 | |
| 35 | -	public function __construct( $admin_page ) { | |
| 35 | +	public function __construct($admin_page) { | |
| 36 | 36 | parent::__construct($admin_page); | 
| 37 | 37 | } | 
| 38 | 38 | |
| @@ -40,12 +40,12 @@ discard block | ||
| 40 | 40 | |
| 41 | 41 | |
| 42 | 42 |  	protected function _setup_data() { | 
| 43 | -		if(isset($this->_req_data['status'] ) && $this->_req_data['status'] == 'trash'){ | |
| 44 | - $this->_data = $this->_admin_page->get_trashed_questions( $this->_per_page,$this->_current_page, FALSE ); | |
| 45 | -		}else{ | |
| 46 | - $this->_data = $this->_admin_page->get_questions( $this->_per_page,$this->_current_page, FALSE ); | |
| 43 | +		if (isset($this->_req_data['status']) && $this->_req_data['status'] == 'trash') { | |
| 44 | + $this->_data = $this->_admin_page->get_trashed_questions($this->_per_page, $this->_current_page, FALSE); | |
| 45 | +		} else { | |
| 46 | + $this->_data = $this->_admin_page->get_questions($this->_per_page, $this->_current_page, FALSE); | |
| 47 | 47 | } | 
| 48 | - $this->_all_data_count = $this->_admin_page->get_questions( $this->_per_page,$this->_current_page, TRUE ); | |
| 48 | + $this->_all_data_count = $this->_admin_page->get_questions($this->_per_page, $this->_current_page, TRUE); | |
| 49 | 49 | } | 
| 50 | 50 | |
| 51 | 51 | |
| @@ -54,8 +54,8 @@ discard block | ||
| 54 | 54 | |
| 55 | 55 |  	protected function _set_properties() { | 
| 56 | 56 | $this->_wp_list_args = array( | 
| 57 | -			'singular' => __('question', 'event_espresso' ), | |
| 58 | -			'plural' => __('questions', 'event_espresso' ), | |
| 57 | +			'singular' => __('question', 'event_espresso'), | |
| 58 | +			'plural' => __('questions', 'event_espresso'), | |
| 59 | 59 | 'ajax' => TRUE, //for now, | 
| 60 | 60 | 'screen' => $this->_admin_page->get_current_screen()->id | 
| 61 | 61 | ); | 
| @@ -71,8 +71,8 @@ discard block | ||
| 71 | 71 | ); | 
| 72 | 72 | |
| 73 | 73 | $this->_sortable_columns = array( | 
| 74 | - 'id' => array( 'QST_ID' => FALSE ), | |
| 75 | - 'display_text' => array( 'QST_display_text' => FALSE ) | |
| 74 | +			'id' => array('QST_ID' => FALSE), | |
| 75 | +			'display_text' => array('QST_display_text' => FALSE) | |
| 76 | 76 | ); | 
| 77 | 77 | |
| 78 | 78 | $this->_hidden_columns = array( | 
| @@ -90,8 +90,8 @@ discard block | ||
| 90 | 90 | |
| 91 | 91 | |
| 92 | 92 |  	protected function _add_view_counts() { | 
| 93 | - $this->_views['all']['count'] = $this->_admin_page->get_questions( $this->_per_page,$this->_current_page, TRUE ); | |
| 94 | -		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_questions', 'espresso_registration_form_trash_question' ) ) { | |
| 93 | + $this->_views['all']['count'] = $this->_admin_page->get_questions($this->_per_page, $this->_current_page, TRUE); | |
| 94 | +		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_questions', 'espresso_registration_form_trash_question')) { | |
| 95 | 95 | $this->_views['trash']['count'] = $this->_admin_page->get_trashed_questions( -1, $this->_current_page, TRUE); | 
| 96 | 96 | } | 
| 97 | 97 | } | 
| @@ -101,8 +101,8 @@ discard block | ||
| 101 | 101 |  	public function column_cb($item) { | 
| 102 | 102 | $system_question = $item->is_system_question(); | 
| 103 | 103 |  		$related_answer_count = $item->count_related('Answer'); | 
| 104 | - $lock_icon = ( !$system_question && $related_answer_count > 0 && $this->_view == 'trash' ) ? 'ee-lock-icon ee-alternate-color' : 'ee-lock-icon ee-system-lock'; | |
| 105 | - return $system_question || (!$system_question && $related_answer_count > 0 && $this->_view == 'trash' ) ? '<span class="' . $lock_icon . '"></span>' . sprintf( '<input type="hidden" name="hdnchk[%1$d]" value="%1$d" />', $item->ID() ) : sprintf( '<input type="checkbox" class="QST_ID" name="checkbox[%1$d]" value="%1$d" />', $item->ID() ); | |
| 104 | + $lock_icon = ( ! $system_question && $related_answer_count > 0 && $this->_view == 'trash') ? 'ee-lock-icon ee-alternate-color' : 'ee-lock-icon ee-system-lock'; | |
| 105 | +		return $system_question || ( ! $system_question && $related_answer_count > 0 && $this->_view == 'trash') ? '<span class="'.$lock_icon.'"></span>'.sprintf('<input type="hidden" name="hdnchk[%1$d]" value="%1$d" />', $item->ID()) : sprintf('<input type="checkbox" class="QST_ID" name="checkbox[%1$d]" value="%1$d" />', $item->ID()); | |
| 106 | 106 | } | 
| 107 | 107 | |
| 108 | 108 | |
| @@ -110,7 +110,7 @@ discard block | ||
| 110 | 110 | |
| 111 | 111 |  	public function column_id(EE_Question $item) { | 
| 112 | 112 | $content = $item->ID(); | 
| 113 | - $content .= ' <span class="show-on-mobile-view-only">' . $item->display_text() . '</span>'; | |
| 113 | + $content .= ' <span class="show-on-mobile-view-only">'.$item->display_text().'</span>'; | |
| 114 | 114 | return $content; | 
| 115 | 115 | } | 
| 116 | 116 | |
| @@ -119,7 +119,7 @@ discard block | ||
| 119 | 119 |  	public function column_display_text(EE_Question $item) { | 
| 120 | 120 | $system_question = $item->is_system_question(); | 
| 121 | 121 | |
| 122 | -		if ( !defined('REG_ADMIN_URL') ) | |
| 122 | +		if ( ! defined('REG_ADMIN_URL')) | |
| 123 | 123 |  			define('REG_ADMIN_URL', EVENTS_ADMIN_URL); | 
| 124 | 124 | |
| 125 | 125 | $edit_query_args = array( | 
| @@ -127,16 +127,16 @@ discard block | ||
| 127 | 127 | 'QST_ID' => $item->ID() | 
| 128 | 128 | ); | 
| 129 | 129 | |
| 130 | -		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_edit_question', 'espresso_registration_form_edit_question', $item->ID() ) ) { | |
| 131 | - $edit_link = EE_Admin_Page::add_query_args_and_nonce( $edit_query_args, EE_FORMS_ADMIN_URL ); | |
| 130 | +		if (EE_Registry::instance()->CAP->current_user_can('ee_edit_question', 'espresso_registration_form_edit_question', $item->ID())) { | |
| 131 | + $edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EE_FORMS_ADMIN_URL); | |
| 132 | 132 | |
| 133 | 133 | $actions = array( | 
| 134 | -				'edit' => '<a href="' . $edit_link . '" title="' . esc_attr__('Edit Event', 'event_espresso') . '">' . __('Edit', 'event_espresso') . '</a>' | |
| 134 | +				'edit' => '<a href="'.$edit_link.'" title="'.esc_attr__('Edit Event', 'event_espresso').'">'.__('Edit', 'event_espresso').'</a>' | |
| 135 | 135 | ); | 
| 136 | 136 | } | 
| 137 | 137 | |
| 138 | 138 | |
| 139 | - $content = EE_Registry::instance()->CAP->current_user_can( 'ee_edit_question', 'espresso_registration_form_edit_question', $item->ID() ) ? '<strong><a class="row-title" href="' . $edit_link . '">' . $item->display_text() . '</a></strong>' : $item->display_text(); | |
| 139 | +		$content = EE_Registry::instance()->CAP->current_user_can('ee_edit_question', 'espresso_registration_form_edit_question', $item->ID()) ? '<strong><a class="row-title" href="'.$edit_link.'">'.$item->display_text().'</a></strong>' : $item->display_text(); | |
| 140 | 140 | $content .= $this->row_actions($actions); | 
| 141 | 141 | return $content; | 
| 142 | 142 | } | 
| @@ -150,16 +150,16 @@ discard block | ||
| 150 | 150 | |
| 151 | 151 | |
| 152 | 152 |  	public function column_values(EE_Question $item) { | 
| 153 | - $optionNames=array(); | |
| 154 | - $options= $item->options(); | |
| 155 | -		if(empty($options)){ | |
| 153 | + $optionNames = array(); | |
| 154 | + $options = $item->options(); | |
| 155 | +		if (empty($options)) { | |
| 156 | 156 | return "N/A"; | 
| 157 | -		}else{ | |
| 158 | -			foreach($options as $optionID=>$option){ | |
| 157 | +		} else { | |
| 158 | +			foreach ($options as $optionID=>$option) { | |
| 159 | 159 | /* @var $option EE_Question_Option */ | 
| 160 | - $optionNames[]=$option->value(); | |
| 160 | + $optionNames[] = $option->value(); | |
| 161 | 161 | } | 
| 162 | -			return implode(', ',$optionNames); | |
| 162 | +			return implode(', ', $optionNames); | |
| 163 | 163 | } | 
| 164 | 164 | } | 
| 165 | 165 | |
| @@ -1,5 +1,5 @@ discard block | ||
| 1 | 1 | <?php | 
| 2 | -if (!defined('EVENT_ESPRESSO_VERSION') ) | |
| 2 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) | |
| 3 | 3 |  	exit('NO direct script access allowed'); | 
| 4 | 4 | |
| 5 | 5 | /** | 
| @@ -35,7 +35,7 @@ discard block | ||
| 35 | 35 | |
| 36 | 36 | |
| 37 | 37 | |
| 38 | -	public function __construct( EE_Admin_Page $admin_page ) { | |
| 38 | +	public function __construct(EE_Admin_Page $admin_page) { | |
| 39 | 39 | parent::__construct($admin_page); | 
| 40 | 40 | } | 
| 41 | 41 | |
| @@ -46,7 +46,7 @@ discard block | ||
| 46 | 46 | $this->_name = 'registration_form'; | 
| 47 | 47 | $this->_metaboxes = array( | 
| 48 | 48 | 0 => array( | 
| 49 | - 'page_route' => array( 'edit', 'create_new' ), | |
| 49 | +				'page_route' => array('edit', 'create_new'), | |
| 50 | 50 | 'func' => 'primary_questions', | 
| 51 | 51 |  				'label' => __('Questions for Primary Registrant', 'event_espresso'), | 
| 52 | 52 | 'priority' => 'default', | 
| @@ -55,28 +55,28 @@ discard block | ||
| 55 | 55 | ); | 
| 56 | 56 | |
| 57 | 57 | //hook into the handler for saving question groups | 
| 58 | - add_filter( 'FHEE__Events_Admin_Page___insert_update_cpt_item__event_update_callbacks', array( $this, 'modify_callbacks'), 10 ); | |
| 58 | +		add_filter('FHEE__Events_Admin_Page___insert_update_cpt_item__event_update_callbacks', array($this, 'modify_callbacks'), 10); | |
| 59 | 59 | |
| 60 | 60 | //hook into revision restores (we're hooking into the global action because EE_Admin_Hooks classes are already restricted by page) | 
| 61 | - add_action( 'AHEE_EE_Admin_Page_CPT__restore_revision', array($this, 'restore_revision' ), 10, 2 ); | |
| 61 | +		add_action('AHEE_EE_Admin_Page_CPT__restore_revision', array($this, 'restore_revision'), 10, 2); | |
| 62 | 62 | } | 
| 63 | 63 | |
| 64 | 64 | |
| 65 | 65 | |
| 66 | 66 | |
| 67 | 67 | |
| 68 | -	public function modify_callbacks( $callbacks ) { | |
| 68 | +	public function modify_callbacks($callbacks) { | |
| 69 | 69 | //now let's add the question group callback | 
| 70 | - $callbacks[] = array( $this, 'primary_question_group_update' ); | |
| 70 | + $callbacks[] = array($this, 'primary_question_group_update'); | |
| 71 | 71 | return $callbacks; | 
| 72 | 72 | } | 
| 73 | 73 | |
| 74 | 74 | |
| 75 | -	public function restore_revision( $post_id, $revision_id ) { | |
| 75 | +	public function restore_revision($post_id, $revision_id) { | |
| 76 | 76 |  		$EVT_MDL = EE_Registry::instance()->load_model('Event'); | 
| 77 | - $post_evt = $EVT_MDL->get_one_by_ID( $post_id ); | |
| 77 | + $post_evt = $EVT_MDL->get_one_by_ID($post_id); | |
| 78 | 78 | //restore revision for primary questions | 
| 79 | -		$post_evt->restore_revision($revision_id, array('Question_Group'), array('Question_Group' => array('Event_Question_Group.EQG_primary' => 1 ) ) ); | |
| 79 | +		$post_evt->restore_revision($revision_id, array('Question_Group'), array('Question_Group' => array('Event_Question_Group.EQG_primary' => 1))); | |
| 80 | 80 | return $post_evt; //for any caffeinated functionality extending. | 
| 81 | 81 | } | 
| 82 | 82 | |
| @@ -100,35 +100,35 @@ discard block | ||
| 100 | 100 | <?php | 
| 101 | 101 | |
| 102 | 102 | $qsg_where['QSG_deleted'] = FALSE; | 
| 103 | - $query_params = array( $qsg_where, 'order_by' => array( 'QSG_order' => 'ASC' ) ); | |
| 104 | - $QSGs = EEM_Question_Group::instance()->get_all( $query_params ); | |
| 105 | -			$EQGs = !empty( $event_id ) ? $this->_event->get_many_related('Question_Group', array(array('Event_Question_Group.EQG_primary' => 1 )) ) : array(); | |
| 103 | +			$query_params = array($qsg_where, 'order_by' => array('QSG_order' => 'ASC')); | |
| 104 | + $QSGs = EEM_Question_Group::instance()->get_all($query_params); | |
| 105 | +			$EQGs = ! empty($event_id) ? $this->_event->get_many_related('Question_Group', array(array('Event_Question_Group.EQG_primary' => 1))) : array(); | |
| 106 | 106 | $EQGids = array_keys($EQGs); | 
| 107 | 107 | |
| 108 | 108 | //EEH_Debug_Tools::printr( $QSGs, '$QSGs <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' ); | 
| 109 | 109 | |
| 110 | -			if ( ! empty( $QSGs )) { | |
| 111 | - $html = count( $QSGs ) > 10 ? '<div style="height:250px;overflow:auto;">' : ''; | |
| 112 | -				foreach ( $QSGs as $QSG ) { | |
| 110 | +			if ( ! empty($QSGs)) { | |
| 111 | + $html = count($QSGs) > 10 ? '<div style="height:250px;overflow:auto;">' : ''; | |
| 112 | +				foreach ($QSGs as $QSG) { | |
| 113 | 113 | |
| 114 | -					$checked = ( in_array( $QSG->ID(), $EQGids ) || $QSG->get('QSG_system') == 1 ) ? ' checked="checked"' : ''; | |
| 114 | +					$checked = (in_array($QSG->ID(), $EQGids) || $QSG->get('QSG_system') == 1) ? ' checked="checked"' : ''; | |
| 115 | 115 |  					$visibility = $QSG->get('QSG_system') == 1 ? ' style="visibility:hidden"' : ''; | 
| 116 | - $edit_query_args = $this->_adminpage_obj->is_caf() ? array( 'action' => 'edit_question_group', 'QSG_ID' => $QSG->ID() ) : array( 'action' => 'question_groups' ); | |
| 117 | - $edit_link = $this->_adminpage_obj->add_query_args_and_nonce( $edit_query_args, EE_FORMS_ADMIN_URL ); | |
| 116 | +					$edit_query_args = $this->_adminpage_obj->is_caf() ? array('action' => 'edit_question_group', 'QSG_ID' => $QSG->ID()) : array('action' => 'question_groups'); | |
| 117 | + $edit_link = $this->_adminpage_obj->add_query_args_and_nonce($edit_query_args, EE_FORMS_ADMIN_URL); | |
| 118 | 118 | |
| 119 | 119 | $html .= ' | 
| 120 | - <p id="event-question-group-' . $QSG->ID() . '"> | |
| 121 | - <input value="' . $QSG->ID() . '" type="checkbox"' . $visibility . ' name="question_groups[' . $QSG->ID() . ']"' . $checked . ' /> | |
| 122 | -						<a href="' . $edit_link . '" title="' . sprintf( esc_attr__('Edit %s Group', 'event_espresso'),  $QSG->get('QSG_name') ) . '" target="_blank">' . $QSG->get('QSG_name') . '</a> | |
| 120 | + <p id="event-question-group-' . $QSG->ID().'"> | |
| 121 | + <input value="' . $QSG->ID().'" type="checkbox"'.$visibility.' name="question_groups['.$QSG->ID().']"'.$checked.' /> | |
| 122 | +						<a href="' . $edit_link.'" title="'.sprintf(esc_attr__('Edit %s Group', 'event_espresso'), $QSG->get('QSG_name')).'" target="_blank">'.$QSG->get('QSG_name').'</a> | |
| 123 | 123 | </p>'; | 
| 124 | 124 | } | 
| 125 | - $html .= count( $QSGs ) > 10 ? '</div>' : ''; | |
| 125 | + $html .= count($QSGs) > 10 ? '</div>' : ''; | |
| 126 | 126 | |
| 127 | 127 | echo $html; | 
| 128 | 128 |  			} else { | 
| 129 | 129 |  				echo __('There seems to be a problem with your questions. Please contact [email protected]', 'event_espresso'); | 
| 130 | 130 | } | 
| 131 | - do_action( 'AHEE_event_editor_questions_notice' ); | |
| 131 | +			do_action('AHEE_event_editor_questions_notice'); | |
| 132 | 132 | ?> | 
| 133 | 133 | </div> | 
| 134 | 134 | <?php | 
| @@ -138,31 +138,31 @@ discard block | ||
| 138 | 138 | |
| 139 | 139 | |
| 140 | 140 | |
| 141 | -	public function primary_question_group_update( $evtobj, $data ) { | |
| 142 | - $question_groups = !empty( $data['question_groups'] ) ? (array) $data['question_groups'] : array(); | |
| 141 | +	public function primary_question_group_update($evtobj, $data) { | |
| 142 | + $question_groups = ! empty($data['question_groups']) ? (array) $data['question_groups'] : array(); | |
| 143 | 143 | $added_qgs = array_keys($question_groups); | 
| 144 | 144 | $success = array(); | 
| 145 | 145 | |
| 146 | 146 | //let's get all current question groups associated with this event. | 
| 147 | -		$current_qgs = $evtobj->get_many_related('Question_Group', array(array('Event_Question_Group.EQG_primary' => 1) )); | |
| 147 | +		$current_qgs = $evtobj->get_many_related('Question_Group', array(array('Event_Question_Group.EQG_primary' => 1))); | |
| 148 | 148 | $current_qgs = array_keys($current_qgs); //we just want the ids | 
| 149 | 149 | |
| 150 | 150 | //now let's get the groups selected in the editor and update (IF we have data) | 
| 151 | -		if ( !empty( $question_groups ) ) { | |
| 152 | -			foreach ( $question_groups as $id => $val ) { | |
| 151 | +		if ( ! empty($question_groups)) { | |
| 152 | +			foreach ($question_groups as $id => $val) { | |
| 153 | 153 | //add to event | 
| 154 | - if ( $val ) | |
| 155 | -					$qg = $evtobj->_add_relation_to( $id, 'Question_Group', array('EQG_primary' => 1) ); | |
| 156 | - $success[] = !empty($qg) ? 1 : 0; | |
| 154 | + if ($val) | |
| 155 | +					$qg = $evtobj->_add_relation_to($id, 'Question_Group', array('EQG_primary' => 1)); | |
| 156 | + $success[] = ! empty($qg) ? 1 : 0; | |
| 157 | 157 | } | 
| 158 | 158 | } | 
| 159 | 159 | |
| 160 | 160 | //wait a minute... are there question groups missing in the saved groups that ARE with the current event? | 
| 161 | - $removed_qgs = array_diff( $current_qgs, $added_qgs ); | |
| 161 | + $removed_qgs = array_diff($current_qgs, $added_qgs); | |
| 162 | 162 | |
| 163 | -		foreach ( $removed_qgs as $qgid ) { | |
| 164 | -			$qg = $evtobj->_remove_relation_to( $qgid, 'Question_Group', array('EQG_primary' => 1 ) ); | |
| 165 | - $success[] = !empty($qg) ? 1 : 0; | |
| 163 | +		foreach ($removed_qgs as $qgid) { | |
| 164 | +			$qg = $evtobj->_remove_relation_to($qgid, 'Question_Group', array('EQG_primary' => 1)); | |
| 165 | + $success[] = ! empty($qg) ? 1 : 0; | |
| 166 | 166 | } | 
| 167 | 167 | |
| 168 | 168 | |
| @@ -1,6 +1,7 @@ discard block | ||
| 1 | 1 | <?php | 
| 2 | -if (!defined('EVENT_ESPRESSO_VERSION') ) | |
| 2 | +if (!defined('EVENT_ESPRESSO_VERSION') ) { | |
| 3 | 3 |  	exit('NO direct script access allowed'); | 
| 4 | +} | |
| 4 | 5 | |
| 5 | 6 | /** | 
| 6 | 7 | * Event Espresso | 
| @@ -151,8 +152,9 @@ discard block | ||
| 151 | 152 |  		if ( !empty( $question_groups ) ) { | 
| 152 | 153 |  			foreach ( $question_groups as $id => $val ) { | 
| 153 | 154 | //add to event | 
| 154 | - if ( $val ) | |
| 155 | -					$qg = $evtobj->_add_relation_to( $id, 'Question_Group', array('EQG_primary' => 1) ); | |
| 155 | +				if ( $val ) { | |
| 156 | +									$qg = $evtobj->_add_relation_to( $id, 'Question_Group', array('EQG_primary' => 1) ); | |
| 157 | + } | |
| 156 | 158 | $success[] = !empty($qg) ? 1 : 0; | 
| 157 | 159 | } | 
| 158 | 160 | } | 
| @@ -26,8 +26,8 @@ | ||
| 26 | 26 |  <?php _e('This shows the type of question. Available options are Text, Textarea, Checkboxes, Radio Buttons, Dropdown, State/Province Dropdown, Country Dropdown, and Date Picker.', 'event_espresso'); ?> | 
| 27 | 27 | </li> | 
| 28 | 28 | <li> | 
| 29 | -<strong><?php _e('Answer Options (for applicable question types)', 'event_espresso');?></strong><br/> | |
| 30 | -<?php _e('Values do not allow any HTML, however, descriptions do allow HTML.', 'event_espresso');?> | |
| 29 | +<strong><?php _e('Answer Options (for applicable question types)', 'event_espresso'); ?></strong><br/> | |
| 30 | +<?php _e('Values do not allow any HTML, however, descriptions do allow HTML.', 'event_espresso'); ?> | |
| 31 | 31 | </li> | 
| 32 | 32 | <li> | 
| 33 | 33 |  <strong><?php _e('Required Question', 'event_espresso'); ?></strong><br /> | 
| @@ -1,5 +1,5 @@ discard block | ||
| 1 | 1 | <?php | 
| 2 | -if (!defined('EVENT_ESPRESSO_VERSION') ) | |
| 2 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) | |
| 3 | 3 |  	exit('NO direct script access allowed'); | 
| 4 | 4 | |
| 5 | 5 | /** | 
| @@ -98,34 +98,34 @@ discard block | ||
| 98 | 98 | |
| 99 | 99 | |
| 100 | 100 |  	protected function _start() { | 
| 101 | -		$content = '<h3>' . __('Add Question Group', 'event_espresso') . '</h3>'; | |
| 102 | -		$content .= '<p>' . __('This tour of the Add Question Group page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso') . '</p>'; | |
| 101 | +		$content = '<h3>'.__('Add Question Group', 'event_espresso').'</h3>'; | |
| 102 | +		$content .= '<p>'.__('This tour of the Add Question Group page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso').'</p>'; | |
| 103 | 103 | |
| 104 | 104 | return $content; | 
| 105 | 105 | } | 
| 106 | 106 | |
| 107 | 107 |  	protected function _qsg_name_stop() { | 
| 108 | -		return '<p>' . __('The name of the question group.', 'event_espresso') . '</p>'; | |
| 108 | +		return '<p>'.__('The name of the question group.', 'event_espresso').'</p>'; | |
| 109 | 109 | } | 
| 110 | 110 | |
| 111 | 111 |  	protected function _qsg_identifier_stop() { | 
| 112 | -		return '<p>' . __('A unique name for your question group.', 'event_espresso') . '</p>'; | |
| 112 | +		return '<p>'.__('A unique name for your question group.', 'event_espresso').'</p>'; | |
| 113 | 113 | } | 
| 114 | 114 | |
| 115 | 115 |  	protected function _qsg_desc_stop() { | 
| 116 | -		return '<p>' . __('A description of the question group.', 'event_espresso') . '</p>'; | |
| 116 | +		return '<p>'.__('A description of the question group.', 'event_espresso').'</p>'; | |
| 117 | 117 | } | 
| 118 | 118 | |
| 119 | 119 |  	protected function _qsg_order_stop() { | 
| 120 | -		return '<p>' . __('Set the order that you want your question group to appear in.', 'event_espresso') . '</p>'; | |
| 120 | +		return '<p>'.__('Set the order that you want your question group to appear in.', 'event_espresso').'</p>'; | |
| 121 | 121 | } | 
| 122 | 122 | |
| 123 | 123 |  	protected function _qsg_show_group_name_stop() { | 
| 124 | -		return '<p>' . __('Specify whether the group name should be shown on the registration page.', 'event_espresso') . '</p>'; | |
| 124 | +		return '<p>'.__('Specify whether the group name should be shown on the registration page.', 'event_espresso').'</p>'; | |
| 125 | 125 | } | 
| 126 | 126 | |
| 127 | 127 |  	protected function _qsg_show_group_desc_stop() { | 
| 128 | -		return '<p>' . __('Specify whether the group description should be shown on the registration page.', 'event_espresso') . '</p>'; | |
| 128 | +		return '<p>'.__('Specify whether the group description should be shown on the registration page.', 'event_espresso').'</p>'; | |
| 129 | 129 | } | 
| 130 | 130 | |
| 131 | 131 | } | 
| 132 | 132 | \ No newline at end of file | 
| @@ -1,6 +1,7 @@ | ||
| 1 | 1 | <?php | 
| 2 | -if (!defined('EVENT_ESPRESSO_VERSION') ) | |
| 2 | +if (!defined('EVENT_ESPRESSO_VERSION') ) { | |
| 3 | 3 |  	exit('NO direct script access allowed'); | 
| 4 | +} | |
| 4 | 5 | |
| 5 | 6 | /** | 
| 6 | 7 | * Event Espresso | 
| @@ -1,5 +1,5 @@ discard block | ||
| 1 | 1 | <?php | 
| 2 | -if (!defined('EVENT_ESPRESSO_VERSION') ) | |
| 2 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) | |
| 3 | 3 |  	exit('NO direct script access allowed'); | 
| 4 | 4 | |
| 5 | 5 | /** | 
| @@ -98,34 +98,34 @@ discard block | ||
| 98 | 98 | |
| 99 | 99 | |
| 100 | 100 |  	protected function _start() { | 
| 101 | -		$content = '<h3>' . __('Add New Question', 'event_espresso') . '</h3>'; | |
| 102 | -		$content .= '<p>' . __('This tour of the Add New Question page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso') . '</p>'; | |
| 101 | +		$content = '<h3>'.__('Add New Question', 'event_espresso').'</h3>'; | |
| 102 | +		$content .= '<p>'.__('This tour of the Add New Question page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso').'</p>'; | |
| 103 | 103 | |
| 104 | 104 | return $content; | 
| 105 | 105 | } | 
| 106 | 106 | |
| 107 | 107 |  	protected function _qst_display_text_stop() { | 
| 108 | -		return '<p>' . __('This is the question that is displayed to registrants who are signing up for events.', 'event_espresso') . '</p>'; | |
| 108 | +		return '<p>'.__('This is the question that is displayed to registrants who are signing up for events.', 'event_espresso').'</p>'; | |
| 109 | 109 | } | 
| 110 | 110 | |
| 111 | 111 |  	protected function _qst_admin_label_stop() { | 
| 112 | -		return '<p>' . __('Helps you understand the difference between questions that may appear similar but are actually different.', 'event_espresso') . '</p>'; | |
| 112 | +		return '<p>'.__('Helps you understand the difference between questions that may appear similar but are actually different.', 'event_espresso').'</p>'; | |
| 113 | 113 | } | 
| 114 | 114 | |
| 115 | 115 |  	protected function _qst_admin_only_stop() { | 
| 116 | -		return '<p>' . __('Specify whether this question should be shown only to admins.', 'event_espresso') . '</p>'; | |
| 116 | +		return '<p>'.__('Specify whether this question should be shown only to admins.', 'event_espresso').'</p>'; | |
| 117 | 117 | } | 
| 118 | 118 | |
| 119 | 119 |  	protected function _qst_type_stop() { | 
| 120 | -		return '<p>' . __('Select the type of question. Available options are Text, Textarea, Single, Multiple, Dropdown, and Date.', 'event_espresso') . '</p>'; | |
| 120 | +		return '<p>'.__('Select the type of question. Available options are Text, Textarea, Single, Multiple, Dropdown, and Date.', 'event_espresso').'</p>'; | |
| 121 | 121 | } | 
| 122 | 122 | |
| 123 | 123 |  	protected function _qst_required_stop() { | 
| 124 | -		return '<p>' . __('Specify whether this question should be required.', 'event_espresso') . '</p>'; | |
| 124 | +		return '<p>'.__('Specify whether this question should be required.', 'event_espresso').'</p>'; | |
| 125 | 125 | } | 
| 126 | 126 | |
| 127 | 127 |  	protected function _qst_required_text_stop() { | 
| 128 | -		return '<p>' . __('Text to display when registrant does not answer question but is required to.', 'event_espresso') . '</p>'; | |
| 128 | +		return '<p>'.__('Text to display when registrant does not answer question but is required to.', 'event_espresso').'</p>'; | |
| 129 | 129 | } | 
| 130 | 130 | |
| 131 | 131 | } | 
| 132 | 132 | \ No newline at end of file | 
| @@ -1,6 +1,7 @@ | ||
| 1 | 1 | <?php | 
| 2 | -if (!defined('EVENT_ESPRESSO_VERSION') ) | |
| 2 | +if (!defined('EVENT_ESPRESSO_VERSION') ) { | |
| 3 | 3 |  	exit('NO direct script access allowed'); | 
| 4 | +} | |
| 4 | 5 | |
| 5 | 6 | /** | 
| 6 | 7 | * Event Espresso |