fix(cs): done (#728)

mozilla · Mar 2, 2022 · 37b4af4 · 37b4af4
1 parent b4d587b
commit 37b4af4
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 76 deletions.
diff --git a/functions.php b/functions.php
@@ -218,7 +218,13 @@ function mozilla_init() {
 	add_theme_support( 'post-thumbnails', array( 'post', 'activity', 'campaign', 'static-page' ) );
 }
 
-
+/**
+ * This should fix the edit-event page not avalaible.
+ */
+function force_page_rewrite_rule() {
+	add_rewrite_rule( '(.?.+?)(?:/([0-9]+))?/?$', 'index.php?pagename=$matches[1]&page=$matches[2]', 'top' );
+}
+add_action( 'init', 'force_page_rewrite_rule', 10, 0 );
 
 add_filter( 'wpml_sl_blacklist_requests', 'wpml_sl_blacklist_requests', 10, 2 );
 

diff --git a/plugins/events-manager/forms/event-editor.php b/plugins/events-manager/forms/event-editor.php
@@ -55,7 +55,7 @@
 $action_url = add_query_arg(
 	array(
 		'action' => 'edit',
-		'lang'   => ICL_LANGUAGE_CODE,
+		'lang'   => defined( 'ICL_LANGUAGE_CODE' ) ? ICL_LANGUAGE_CODE : 'en',
 	),
 	get_site_url( null, 'events/edit-event' )
 );

diff --git a/plugins/events-manager/templates/event-single.php b/plugins/events-manager/templates/event-single.php
@@ -142,16 +142,24 @@
 				} else {
 					$img_url = $img_url;
 				}
-				?>
-				<div class="card__image
-				<?php
 				if ( '' !== $img_url && $img_url ) {
-					echo esc_attr( 'card__image--active' );
+					$class_card = esc_attr( 'card__image--active' );
 				} else {
-					echo esc_attr( '' );
+					$class_card = esc_attr( '' );
 				}
+
+				$url_edit = esc_attr(
+					add_query_arg(
+						array(
+							'action'   => 'edit',
+							'event_id' => $em_event->event_id,
+							'nonce'    => wp_create_nonce( 'edit-event' ),
+						),
+						get_home_url( '', 'events/edit-event/' )
+					)
+				);
 				?>
-					"
+				<div class="card__image <? echo $class_card; // phpcs:ignore ?>"
 					<?php
 					if ( $img_url && strlen( $img_url ) > 0 ) :
 						?>
@@ -162,20 +170,7 @@
 						<?php
 						if ( isset( $img_url ) && strlen( $img_url ) > 0 ) :
 							?>
-							card__edit-btn--white<?php endif; ?>" href="
-															<?php
-																echo esc_attr(
-																	add_query_arg(
-																		array(
-																			'action'   => 'edit',
-																			'event_id' => $em_event->event_id,
-																			'nonce'    => wp_create_nonce( 'edit-event' ),
-																		),
-																		get_home_url( '', 'events/edit-event/' )
-																	)
-																);
-															?>
-															">
+							card__edit-btn--white<?php endif; ?>" href="<?php echo $url_edit; // phpcs:ignore ?>">
 							<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
 								<path d="M23.64 6.36L17.64 0.36C17.16 -0.12 16.44 -0.12 15.96 0.36L0.36 15.96C0.12 16.2 0 16.44 0 16.8V22.8C0 23.52 0.48 24 1.2 24H7.2C7.56 24 7.8 23.88 8.04   23.64L23.64 8.04C24.12 7.56 24.12 6.84 23.64 6.36ZM6.72 21.6H2.4V17.28L16.8 2.88L21.12 7.2L6.72 21.6Z"  fill="#0060DF"/>
 							</svg>
@@ -187,20 +182,7 @@
 								<?php
 								if ( $img_url && isset( $_SERVER['REQUEST_URI'] ) ) :
 									?>
-									card__edit-btn--white<?php endif; ?>" href="
-										<?php
-																		echo esc_attr(
-																			add_query_arg(
-																				array(
-																					'action'   => 'edit',
-																					'event_id' => $em_event->event_id,
-																					'nonce'    => wp_create_nonce( 'edit-event' ),
-																				),
-																				get_home_url( '', 'events/edit-event/' )
-																			)
-																		);
-										?>
-																				">
+									card__edit-btn--white<?php endif; ?>" href="<?php echo $url_edit; // phpcs:ignore ?>">
 									<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
 										<path d="M23.64 6.36L17.64 0.36C17.16 -0.12 16.44 -0.12 15.96 0.36L0.36 15.96C0.12 16.2 0 16.44 0 16.8V22.8C0 23.52 0.48 24 1.2 24H7.2C7.56 24 7.8 23.88 8.04 23.64L23.64 8.04C24.12 7.56 24.12 6.84 23.64 6.36ZM6.72 21.6H2.4V17.28L16.8 2.88L21.12 7.2L6.72 21.6Z"  fill="#0060DF"/>
 									</svg>

diff --git a/plugins/events-manager/templates/events-list.php b/plugins/events-manager/templates/events-list.php
@@ -312,36 +312,36 @@ class="events__nav__link
 		?>
 	<div class="campaigns__pagination">
 		<div class="campaigns__pagination-container">
-			<?php
-			if ( $total_pages > 1 ) {
-				$url = '';
-				if ( 'all' !== $country && $country ) {
-					$url = '&country=' . esc_attr( $country );
-				}
+		<?php
+		$url = '';
+		if ( 'all' !== $country && $country ) {
+			$url = '&country=' . esc_attr( $country );
+		}
 
-				if ( $event_tag && 'all' !== $event_tag ) {
-					$url = $url . '&tag=' . esc_attr( $event_tag );
-				}
+		if ( $event_tag && 'all' !== $event_tag ) {
+			$url = $url . '&tag=' . esc_attr( $event_tag );
+		}
 
-				if ( $event_initiative && 'all' !== strtolower( $event_initiative ) ) {
-					$url = $url . '&initiative=' . esc_attr( htmlspecialchars( $initiative_input, ENT_QUOTES, 'UTF-8' ) );
-				}
+		if ( $event_initiative && 'all' !== strtolower( $event_initiative ) ) {
+			$url = $url . '&initiative=' . esc_attr( htmlspecialchars( $initiative_input, ENT_QUOTES, 'UTF-8' ) );
+		}
 
-				if ( $event_language && 'all' !== $event_language ) {
-					$url = $url . '&language=' . esc_attr( htmlspecialchars( $event_language, ENT_QUOTES, 'UTF-8' ) );
-				}
+		if ( $event_language && 'all' !== $event_language ) {
+			$url = $url . '&language=' . esc_attr( htmlspecialchars( $event_language, ENT_QUOTES, 'UTF-8' ) );
+		}
 
-				if ( $event_language && 'all' !== $event_language ) {
-					$url = $url . '&view=' . esc_attr( trim( $view ) );
-				}
-				?>
+		if ( $event_language && 'all' !== $event_language ) {
+			$url = $url . '&view=' . esc_attr( trim( $view ) );
+		}
+		if ( $total_pages > 1 ) {
+			?>
 			<a href="/events/?pno=<?php print esc_attr( $previous_page ) . $url; // phpcs:ignore ?>" class="campaigns__pagination-link campaigns__pagination-link--arrow">
 				<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
 					<path d="M17 23L6 12L17 1" stroke="#0060DF" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
 				</svg>
 			</a>
 				<?php if ( $page_min > 1 ) { ?>
-				<a href="/events/?pno=1<?php print esc_attr( $url ); ?>"
+				<a href="/events/?pno=1<?php print $url; // phpcs:ignore ?>"
 					class="campaigns__pagination-link campaigns__pagination-link--first"><?php print esc_html( '1' ); ?>
 				</a>
 					&hellip;
@@ -360,31 +360,29 @@ class="campaigns__pagination-link
 			</a>
 			<?php endfor; ?>
 				<?php
-				if ( $total_pages > $range && $current_page < $total_pages - 1 ) :
-					?>
-					&hellip;
-					<?php
-					$url = '';
-					if ( 'all' !== $country && $country ) {
-						$url = '&country=' . esc_attr( $country );
-					}
+				$url = '';
+				if ( 'all' !== $country && $country ) {
+					$url = '&country=' . esc_attr( $country );
+				}
 
-					if ( $event_tag && 'all' !== $event_tag ) {
-						$url = $url . '&tag=' . esc_attr( $event_tag );
-					}
+				if ( $event_tag && 'all' !== $event_tag ) {
+					$url = $url . '&tag=' . esc_attr( $event_tag );
+				}
 
-					if ( $event_initiative && 'all' !== $event_initiative ) {
-						$url = $url . '&initiative=' . esc_attr( htmlspecialchars( $initiative, ENT_QUOTES, 'UTF-8' ) );
-					}
+				if ( $event_initiative && 'all' !== $event_initiative ) {
+					$url = $url . '&initiative=' . esc_attr( htmlspecialchars( $initiative, ENT_QUOTES, 'UTF-8' ) );
+				}
 
-					if ( $event_language && 'all' !== $event_language ) {
-						$url = $url . '&language=' . esc_attr( htmlspecialchars( $event_language, ENT_QUOTES, 'UTF-8' ) );
-					}
+				if ( $event_language && 'all' !== $event_language ) {
+					$url = $url . '&language=' . esc_attr( htmlspecialchars( $event_language, ENT_QUOTES, 'UTF-8' ) );
+				}
 
-					if ( strlen( $view ) > 0 ) {
-						$url = $url . '&view=' . esc_attr( trim( $view ) );
-					}
+				if ( strlen( $view ) > 0 ) {
+					$url = $url . '&view=' . esc_attr( trim( $view ) );
+				}
+				if ( $total_pages > $range && $current_page < $total_pages - 1 ) :
 					?>
+					&hellip;
 				<a href="/events/?pno=<?php print esc_attr( $total_pages ) . $url; // phpcs:ignore ?>"
 					class="campaigns__pagination-link
 					<?php