From 50f5828ac7fa08a1afa0a52b456a1db49071c804 Mon Sep 17 00:00:00 2001
From: champsupertramp <heychampsupertramp@gmail.com>
Date: Wed, 6 Jul 2016 22:29:31 +0800
Subject: [PATCH] Fix file inclusion in UM admin dashboard

---
 admin/core/um-admin-dashboard.php        | 85 ++++++++++++------------
 admin/templates/welcome/about_header.php |  2 +-
 2 files changed, 43 insertions(+), 44 deletions(-)

diff --git a/admin/core/um-admin-dashboard.php b/admin/core/um-admin-dashboard.php
index ab2718d5..6d2e1b84 100644
--- a/admin/core/um-admin-dashboard.php
+++ b/admin/core/um-admin-dashboard.php
@@ -283,62 +283,61 @@ class UM_Admin_Dashboard {
 	function admin_page() {
 		
 		$page = $_REQUEST['page'];
-		if ( $page == 'ultimatemember' && !isset($_REQUEST['um-addon']) ) {
+		if ( $page == 'ultimatemember' && ! isset( $_REQUEST['um-addon'] ) ) {
 
-		?>
-		
-		<div id="um-metaboxes-general" class="wrap">
-		
-			<h2>Ultimate Member <sup><?php echo ultimatemember_version; ?></sup></h2>
+			?>
+			
+			<div id="um-metaboxes-general" class="wrap">
+			
+				<h2>Ultimate Member <sup><?php echo ultimatemember_version; ?></sup></h2>
 
-				<?php wp_nonce_field('um-metaboxes-general'); ?>
-				<?php wp_nonce_field('closedpostboxes', 'closedpostboxesnonce', false ); ?>
-				<?php wp_nonce_field('meta-box-order', 'meta-box-order-nonce', false ); ?>
-				
-				<input type="hidden" name="action" value="save_um_metaboxes_general" />
-				
-				<div id="dashboard-widgets-wrap">
-		
-					 <div id="dashboard-widgets" class="metabox-holder um-metabox-holder"> 
+					<?php wp_nonce_field('um-metaboxes-general'); ?>
+					<?php wp_nonce_field('closedpostboxes', 'closedpostboxesnonce', false ); ?>
+					<?php wp_nonce_field('meta-box-order', 'meta-box-order-nonce', false ); ?>
+					
+					<input type="hidden" name="action" value="save_um_metaboxes_general" />
+					
+					<div id="dashboard-widgets-wrap">
+			
+						 <div id="dashboard-widgets" class="metabox-holder um-metabox-holder"> 
 
-							<div id="postbox-container-1" class="postbox-container"><?php do_meta_boxes($this->pagehook,'core',null);  ?></div>
-							<div id="postbox-container-2" class="postbox-container"><?php do_meta_boxes($this->pagehook,'normal',null); ?></div>
-							<div id="postbox-container-3" class="postbox-container"><?php do_meta_boxes($this->pagehook,'side',null); ?></div>
+								<div id="postbox-container-1" class="postbox-container"><?php do_meta_boxes($this->pagehook,'core',null);  ?></div>
+								<div id="postbox-container-2" class="postbox-container"><?php do_meta_boxes($this->pagehook,'normal',null); ?></div>
+								<div id="postbox-container-3" class="postbox-container"><?php do_meta_boxes($this->pagehook,'side',null); ?></div>
 
-					 </div>
+						 </div>
 
-				</div>
+					</div>
 
-		</div><div class="um-admin-clear"></div>
-		
-		<div class="um-admin-dash-share"><?php global $reduxConfig; foreach ( $reduxConfig->args['share_icons'] as $k => $arr ) { ?><a href="<?php echo $arr['url']; ?>" class="um-about-icon um-admin-tipsy-n" title="<?php echo $arr['title']; ?>" target="_blank"><i class="<?php echo $arr['icon']; ?>"></i></a><?php } ?>	
-		</div><div class="um-admin-clear"></div>
-		
-		<script type="text/javascript">
-			//<![CDATA[
-			jQuery(document).ready( function($) {
-				// postboxes setup
-				postboxes.add_postbox_toggles('<?php echo $this->pagehook; ?>');
-			});
-			//]]>
-		</script>
-		
-		<?php
+			</div><div class="um-admin-clear"></div>
+			
+			<div class="um-admin-dash-share"><?php global $reduxConfig; foreach ( $reduxConfig->args['share_icons'] as $k => $arr ) { ?><a href="<?php echo $arr['url']; ?>" class="um-about-icon um-admin-tipsy-n" title="<?php echo $arr['title']; ?>" target="_blank"><i class="<?php echo $arr['icon']; ?>"></i></a><?php } ?>	
+			</div><div class="um-admin-clear"></div>
+			
+			<script type="text/javascript">
+				//<![CDATA[
+				jQuery(document).ready( function($) {
+					// postboxes setup
+					postboxes.add_postbox_toggles('<?php echo $this->pagehook; ?>');
+				});
+				//]]>
+			</script>
+			
+			<?php
 			
 		} else if ( $page == 'ultimatemember-extensions' ) {
 			
 			include_once um_path . 'admin/templates/extensions.php';
 			
-		} else if ( strstr( $page, 'ultimatemember-' ) ) {
+		} else if (  $page == 'ultimatemember-about' ) {
 
-			$template = str_replace('ultimatemember-','',$page);
-			$file = um_path . 'admin/templates/welcome/'. $template . '.php';
+				include_once um_path . 'admin/templates/welcome/about.php';
+		
+		} else if (  $page == 'ultimatemember-start' ) {
 
-			if ( file_exists( $file ) ){
-				include_once um_path . 'admin/templates/welcome/'. $template . '.php';
-			}
-
-		}
+				include_once um_path . 'admin/templates/welcome/start.php';
+		
+		} 
 	
 	}
 
diff --git a/admin/templates/welcome/about_header.php b/admin/templates/welcome/about_header.php
index 375d3934..e83b4de7 100644
--- a/admin/templates/welcome/about_header.php
+++ b/admin/templates/welcome/about_header.php
@@ -28,7 +28,7 @@
 	
 		<?php foreach( $this->about_tabs as $k => $tab ) {
 		
-			if ( $k == $template ) {
+			if ( isset( $_REQUEST['page'] ) && 'ultimatemember-'.$k == $_REQUEST['page']  ) {
 				$active = 'nav-tab-active';
 			} else {
 				$active = '';