Completed
Branch BUG-10801-event-single-config (d49238)
by
unknown
122:02 queued 108:45
created
caffeinated/modules/event_single_caff/EED_Event_Single_Caff.module.php 2 patches
Indentation   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -118,40 +118,40 @@
 block discarded – undo
118 118
 	 * @return EE_Template_Config
119 119
 	 */
120 120
 	public static function update_template_settings(EE_Template_Config $CFG, $REQ ) {
121
-	    if(! $CFG->EED_Event_Single instanceof EE_Event_Single_Config){
122
-            $CFG->EED_Event_Single = new EE_Event_Single_Config();
123
-        }
124
-        $display_order_event = $CFG->EED_Event_Single->display_order_event !== null
125
-            ? $CFG->EED_Event_Single->display_order_event
126
-            : EED_Event_Single::EVENT_DETAILS_PRIORITY;
121
+		if(! $CFG->EED_Event_Single instanceof EE_Event_Single_Config){
122
+			$CFG->EED_Event_Single = new EE_Event_Single_Config();
123
+		}
124
+		$display_order_event = $CFG->EED_Event_Single->display_order_event !== null
125
+			? $CFG->EED_Event_Single->display_order_event
126
+			: EED_Event_Single::EVENT_DETAILS_PRIORITY;
127 127
 		$display_order_datetimes = $CFG->EED_Event_Single->display_order_datetimes !== null
128
-            ? $CFG->EED_Event_Single->display_order_datetimes
129
-            : EED_Event_Single::EVENT_DATETIMES_PRIORITY;
130
-        $display_order_tickets = $CFG->EED_Event_Single->display_order_tickets !== null
131
-            ? $CFG->EED_Event_Single->display_order_tickets
132
-            : EED_Event_Single::EVENT_TICKETS_PRIORITY;
128
+			? $CFG->EED_Event_Single->display_order_datetimes
129
+			: EED_Event_Single::EVENT_DATETIMES_PRIORITY;
130
+		$display_order_tickets = $CFG->EED_Event_Single->display_order_tickets !== null
131
+			? $CFG->EED_Event_Single->display_order_tickets
132
+			: EED_Event_Single::EVENT_TICKETS_PRIORITY;
133 133
 		$display_order_venue = $CFG->EED_Event_Single->display_order_venue !== null
134
-            ? $CFG->EED_Event_Single->display_order_venue
135
-            : EED_Event_Single::EVENT_VENUES_PRIORITY;
134
+			? $CFG->EED_Event_Single->display_order_venue
135
+			: EED_Event_Single::EVENT_VENUES_PRIORITY;
136 136
 		$CFG->EED_Event_Single = new EE_Event_Single_Config();
137 137
 		$CFG->EED_Event_Single->display_status_banner_single = ! empty( $REQ['display_status_banner_single'] )
138
-            && $REQ['display_status_banner_single'];
138
+			&& $REQ['display_status_banner_single'];
139 139
 		$CFG->EED_Event_Single->display_venue = ! empty( $REQ['display_venue'] ) && $REQ['display_venue'];
140 140
 		$CFG->EED_Event_Single->use_sortable_display_order = ! empty( $REQ[ 'EED_Events_Single_use_sortable_display_order' ] )
141
-            ? absint( $REQ[ 'EED_Events_Single_use_sortable_display_order' ] )
142
-            : 0;
141
+			? absint( $REQ[ 'EED_Events_Single_use_sortable_display_order' ] )
142
+			: 0;
143 143
 		$CFG->EED_Event_Single->display_order_event = $CFG->EED_Event_Single->use_sortable_display_order
144
-            ? $display_order_event
145
-            : EED_Event_Single::EVENT_DETAILS_PRIORITY;
144
+			? $display_order_event
145
+			: EED_Event_Single::EVENT_DETAILS_PRIORITY;
146 146
 		$CFG->EED_Event_Single->display_order_datetimes = $CFG->EED_Event_Single->use_sortable_display_order
147
-            ? $display_order_datetimes
148
-            : EED_Event_Single::EVENT_DATETIMES_PRIORITY;
147
+			? $display_order_datetimes
148
+			: EED_Event_Single::EVENT_DATETIMES_PRIORITY;
149 149
 		$CFG->EED_Event_Single->display_order_tickets = $CFG->EED_Event_Single->use_sortable_display_order
150
-            ? $display_order_tickets
151
-            : EED_Event_Single::EVENT_TICKETS_PRIORITY;
150
+			? $display_order_tickets
151
+			: EED_Event_Single::EVENT_TICKETS_PRIORITY;
152 152
 		$CFG->EED_Event_Single->display_order_venue = $CFG->EED_Event_Single->use_sortable_display_order
153
-            ? $display_order_venue
154
-            : EED_Event_Single::EVENT_VENUES_PRIORITY;
153
+			? $display_order_venue
154
+			: EED_Event_Single::EVENT_VENUES_PRIORITY;
155 155
 		do_action( 'AHEE__EED_Event_Single__update_template_settings__after_update', $CFG, $REQ );
156 156
 		return $CFG;
157 157
 	}
Please login to merge, or discard this patch.
Spacing   +43 added lines, -43 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 	 * @return EED_Event_Single_Caff
30 30
 	 */
31 31
 	public static function instance() {
32
-		return parent::get_instance( __CLASS__ );
32
+		return parent::get_instance(__CLASS__);
33 33
 	}
34 34
 
35 35
 
@@ -50,34 +50,34 @@  discard block
 block discarded – undo
50 50
 	 *  @return 	void
51 51
 	 */
52 52
 	public static function set_hooks_admin() {
53
-		define( 'EVENT_SINGLE_CAFF_TEMPLATES_PATH', plugin_dir_path( __FILE__ ) . 'templates' . DS );
54
-		define( 'EVENT_SINGLE_CAFF_ASSETS_URL', plugin_dir_url( __FILE__ ) . 'assets' . DS );
53
+		define('EVENT_SINGLE_CAFF_TEMPLATES_PATH', plugin_dir_path(__FILE__).'templates'.DS);
54
+		define('EVENT_SINGLE_CAFF_ASSETS_URL', plugin_dir_url(__FILE__).'assets'.DS);
55 55
 		add_action(
56 56
 			'FHEE__EE_Admin_Page___load_page_dependencies__after_load__espresso_events__template_settings',
57
-			array( 'EED_Event_Single_Caff', 'load_scripts_styles' ),
57
+			array('EED_Event_Single_Caff', 'load_scripts_styles'),
58 58
 			10
59 59
 		);
60
-		add_action( 'AHEE__template_settings__template__before_settings_form', array( 'EED_Event_Single_Caff', 'template_settings_form' ), 10 );
61
-		add_filter( 'FHEE__General_Settings_Admin_Page__update_template_settings__data', array( 'EED_Event_Single_Caff', 'update_template_settings' ), 10, 2 );
60
+		add_action('AHEE__template_settings__template__before_settings_form', array('EED_Event_Single_Caff', 'template_settings_form'), 10);
61
+		add_filter('FHEE__General_Settings_Admin_Page__update_template_settings__data', array('EED_Event_Single_Caff', 'update_template_settings'), 10, 2);
62 62
 		// AJAX
63
-		add_action( 'wp_ajax_espresso_update_event_single_order', array( 'EED_Event_Single_Caff', 'update_event_single_order' ) );
64
-		add_action( 'wp_ajax_nopriv_espresso_update_event_single_order', array( 'EED_Event_Single_Caff', 'update_event_single_order' ) );
63
+		add_action('wp_ajax_espresso_update_event_single_order', array('EED_Event_Single_Caff', 'update_event_single_order'));
64
+		add_action('wp_ajax_nopriv_espresso_update_event_single_order', array('EED_Event_Single_Caff', 'update_event_single_order'));
65 65
 
66 66
 	}
67 67
 
68 68
 
69 69
 
70 70
 	public static function load_scripts_styles() {
71
-		add_action( 'admin_enqueue_scripts', array( 'EED_Event_Single_Caff', 'enqueue_scripts_styles' ), 10 );
71
+		add_action('admin_enqueue_scripts', array('EED_Event_Single_Caff', 'enqueue_scripts_styles'), 10);
72 72
 	}
73 73
 
74 74
 
75 75
 
76 76
 	public static function enqueue_scripts_styles() {
77
-		wp_register_style( 'eed-event-single-sortable', EVENT_SINGLE_CAFF_ASSETS_URL . 'eed_event_single_sortable.css', array(), EVENT_ESPRESSO_VERSION );
78
-		wp_enqueue_style( 'eed-event-single-sortable' );
79
-		wp_register_script( 'eed-event-single-sortable', EVENT_SINGLE_CAFF_ASSETS_URL . 'eed_event_single_sortable.js', array( 'jquery-ui-sortable' ), EVENT_ESPRESSO_VERSION, true );
80
-		wp_enqueue_script( 'eed-event-single-sortable' );
77
+		wp_register_style('eed-event-single-sortable', EVENT_SINGLE_CAFF_ASSETS_URL.'eed_event_single_sortable.css', array(), EVENT_ESPRESSO_VERSION);
78
+		wp_enqueue_style('eed-event-single-sortable');
79
+		wp_register_script('eed-event-single-sortable', EVENT_SINGLE_CAFF_ASSETS_URL.'eed_event_single_sortable.js', array('jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, true);
80
+		wp_enqueue_script('eed-event-single-sortable');
81 81
 	}
82 82
 
83 83
 
@@ -91,21 +91,21 @@  discard block
 block discarded – undo
91 91
 	 */
92 92
 	public static function template_settings_form() {
93 93
 		$config = EE_Registry::instance()->CFG->template_settings;
94
-		$config = isset( $config->EED_Event_Single ) && $config->EED_Event_Single instanceof EE_Event_Single_Config ? $config->EED_Event_Single : new EE_Event_Single_Config();
95
-		$config->use_sortable_display_order = isset( $config->use_sortable_display_order ) ? $config->use_sortable_display_order : false;
96
-		$config = apply_filters( 'FHEE__EED_Event_Single__template_settings_form__event_list_config', $config );
94
+		$config = isset($config->EED_Event_Single) && $config->EED_Event_Single instanceof EE_Event_Single_Config ? $config->EED_Event_Single : new EE_Event_Single_Config();
95
+		$config->use_sortable_display_order = isset($config->use_sortable_display_order) ? $config->use_sortable_display_order : false;
96
+		$config = apply_filters('FHEE__EED_Event_Single__template_settings_form__event_list_config', $config);
97 97
 
98 98
 		$event_single_order_array = array();
99
-		$event_single_order_array[ $config->display_order_tickets ] = 'tickets';
100
-		$event_single_order_array[ $config->display_order_datetimes ] = 'datetimes';
101
-		$event_single_order_array[ $config->display_order_event ] = 'event';
102
-		$event_single_order_array[ $config->display_order_venue ] = 'venue';
99
+		$event_single_order_array[$config->display_order_tickets] = 'tickets';
100
+		$event_single_order_array[$config->display_order_datetimes] = 'datetimes';
101
+		$event_single_order_array[$config->display_order_event] = 'event';
102
+		$event_single_order_array[$config->display_order_venue] = 'venue';
103 103
 		// get template parts
104
-		$template_parts = EED_Event_Single::instance()->initialize_template_parts( $config );
104
+		$template_parts = EED_Event_Single::instance()->initialize_template_parts($config);
105 105
 		// convert to array so that we can add more properties
106
-		$config = get_object_vars( $config );
107
-		$config[ 'event_single_display_order' ] = $template_parts->generate_sortable_list_of_template_parts( 'event-single-sortable-js', '', 'single-sortable-li single-sortable-js' );
108
-		EEH_Template::display_template( EVENT_SINGLE_CAFF_TEMPLATES_PATH . 'admin-event-single-settings.template.php', $config );
106
+		$config = get_object_vars($config);
107
+		$config['event_single_display_order'] = $template_parts->generate_sortable_list_of_template_parts('event-single-sortable-js', '', 'single-sortable-li single-sortable-js');
108
+		EEH_Template::display_template(EVENT_SINGLE_CAFF_TEMPLATES_PATH.'admin-event-single-settings.template.php', $config);
109 109
 	}
110 110
 
111 111
 
@@ -117,8 +117,8 @@  discard block
 block discarded – undo
117 117
 	 * @param array $REQ
118 118
 	 * @return EE_Template_Config
119 119
 	 */
120
-	public static function update_template_settings(EE_Template_Config $CFG, $REQ ) {
121
-	    if(! $CFG->EED_Event_Single instanceof EE_Event_Single_Config){
120
+	public static function update_template_settings(EE_Template_Config $CFG, $REQ) {
121
+	    if ( ! $CFG->EED_Event_Single instanceof EE_Event_Single_Config) {
122 122
             $CFG->EED_Event_Single = new EE_Event_Single_Config();
123 123
         }
124 124
         $display_order_event = $CFG->EED_Event_Single->display_order_event !== null
@@ -134,11 +134,11 @@  discard block
 block discarded – undo
134 134
             ? $CFG->EED_Event_Single->display_order_venue
135 135
             : EED_Event_Single::EVENT_VENUES_PRIORITY;
136 136
 		$CFG->EED_Event_Single = new EE_Event_Single_Config();
137
-		$CFG->EED_Event_Single->display_status_banner_single = ! empty( $REQ['display_status_banner_single'] )
137
+		$CFG->EED_Event_Single->display_status_banner_single = ! empty($REQ['display_status_banner_single'])
138 138
             && $REQ['display_status_banner_single'];
139
-		$CFG->EED_Event_Single->display_venue = ! empty( $REQ['display_venue'] ) && $REQ['display_venue'];
140
-		$CFG->EED_Event_Single->use_sortable_display_order = ! empty( $REQ[ 'EED_Events_Single_use_sortable_display_order' ] )
141
-            ? absint( $REQ[ 'EED_Events_Single_use_sortable_display_order' ] )
139
+		$CFG->EED_Event_Single->display_venue = ! empty($REQ['display_venue']) && $REQ['display_venue'];
140
+		$CFG->EED_Event_Single->use_sortable_display_order = ! empty($REQ['EED_Events_Single_use_sortable_display_order'])
141
+            ? absint($REQ['EED_Events_Single_use_sortable_display_order'])
142 142
             : 0;
143 143
 		$CFG->EED_Event_Single->display_order_event = $CFG->EED_Event_Single->use_sortable_display_order
144 144
             ? $display_order_event
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
 		$CFG->EED_Event_Single->display_order_venue = $CFG->EED_Event_Single->use_sortable_display_order
153 153
             ? $display_order_venue
154 154
             : EED_Event_Single::EVENT_VENUES_PRIORITY;
155
-		do_action( 'AHEE__EED_Event_Single__update_template_settings__after_update', $CFG, $REQ );
155
+		do_action('AHEE__EED_Event_Single__update_template_settings__after_update', $CFG, $REQ);
156 156
 		return $CFG;
157 157
 	}
158 158
 
@@ -166,23 +166,23 @@  discard block
 block discarded – undo
166 166
 	 */
167 167
 	public static function update_event_single_order() {
168 168
 		$config_saved = false;
169
-		$template_parts = sanitize_text_field( $_POST[ 'elements' ] );
170
-		if ( ! empty( $template_parts ) ) {
171
-			$template_parts = explode( ',', trim( $template_parts, ',' ) );
172
-			foreach ( $template_parts as $key => $template_part ) {
169
+		$template_parts = sanitize_text_field($_POST['elements']);
170
+		if ( ! empty($template_parts)) {
171
+			$template_parts = explode(',', trim($template_parts, ','));
172
+			foreach ($template_parts as $key => $template_part) {
173 173
 				$template_part = "display_order_$template_part";
174
-				$priority = ( $key * 10 ) + EED_Event_Single::EVENT_DETAILS_PRIORITY;
174
+				$priority = ($key * 10) + EED_Event_Single::EVENT_DETAILS_PRIORITY;
175 175
 				EE_Registry::instance()->CFG->template_settings->EED_Event_Single->{$template_part} = $priority;
176
-				do_action( "AHEE__EED_Event_Single__update_event_single_order__$template_part", $priority );
176
+				do_action("AHEE__EED_Event_Single__update_event_single_order__$template_part", $priority);
177 177
 			}
178
-			$config_saved = EE_Registry::instance()->CFG->update_espresso_config( false, false );
178
+			$config_saved = EE_Registry::instance()->CFG->update_espresso_config(false, false);
179 179
 		}
180
-		if ( $config_saved ) {
181
-			EE_Error::add_success( __( 'Display Order has been successfully updated.', 'event_espresso' ) );
180
+		if ($config_saved) {
181
+			EE_Error::add_success(__('Display Order has been successfully updated.', 'event_espresso'));
182 182
 		} else {
183
-			EE_Error::add_error( __( 'Display Order was not updated.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
183
+			EE_Error::add_error(__('Display Order was not updated.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
184 184
 		}
185
-		echo wp_json_encode( EE_Error::get_notices( false ));
185
+		echo wp_json_encode(EE_Error::get_notices(false));
186 186
 		exit();
187 187
 	}
188 188
 
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
 	 * @param WP $WP
196 196
 	 * @return    void
197 197
 	 */
198
-	public function run( $WP ) {
198
+	public function run($WP) {
199 199
 	}
200 200
 
201 201
 
Please login to merge, or discard this patch.