From a1890ee77020e5ed82a391c7c3cce52c4f203ca7 Mon Sep 17 00:00:00 2001
From: szk11001 <salman.kaleem@uconn.edu>
Date: Fri, 22 Jan 2016 12:50:59 -0500
Subject: [PATCH] Revert "Add 403 redirect page"

This reverts commit 9f03b2d5bdc8ad0fdc4e136ca19d5d9c6676bfcd.
---
 403.php       | 53 ---------------------------------------------------
 404.php       |  7 +++++++
 functions.php | 33 ++++++++------------------------
 3 files changed, 15 insertions(+), 78 deletions(-)
 delete mode 100644 403.php

diff --git a/403.php b/403.php
deleted file mode 100644
index 1ee77dc..0000000
--- a/403.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * The template for displaying 403 pages (Forbidden).
- *
- * @package cornerstone
- */
-get_header(); ?>
-<div id="error403">
-	<div class="row">
-		<div class="col-sm-12">
-			<div id="primary" class="content-area">
-				<main id="main" class="site-main" role="main">
-					<section class="error-403 not-found">
-						<div class="row">
-							<div class="col-sm-6">
-								<header class="page-header">
-									<h1 class="page-title"><?php _e( 'I\'m Sorry... <br/>That page can&rsquo;t be found.', 'cs' ); ?></h1>
-									<p class="text-muted">Error 403: Forbidden.</p>
-								</header><!-- .page-header -->
-								<div class="page-content">
-									<p><?php _e( 'It looks like nothing was found at this location. Maybe try one of the links above or a search?', 'cs' ); ?></p>
-									<div class="col-sm-6">
-										<?php get_search_form(); ?>
-									</div>
-									<div class="col-sm-6">
-										<ul>
-										<?php
-										if (wp_get_nav_menu_object('404')){
-											$defaults = array(
-												'menu'			=> '404',
-												'container'       => false,
-												'items_wrap'      => '%3$s',
-												'depth'			=> 1,
-												'fallback_cb'		=> false
-											);
-											wp_nav_menu( $defaults );
-										}
-										?>
-										</ul>
-									</div>
-								</div><!-- .page-content -->
-							</div>
-							<div class="col-sm-6">
-								<img src="<?php bloginfo('template_directory'); ?>/img/JonathanStill.jpg" alt="Photo of a puppy."/>
-							</div>
-						</div>
-					</section><!-- .error-404 -->
-				</main><!-- #main -->
-			</div><!-- #primary -->
-		</div>
-	</div>
-</div>
-<?php get_footer(); ?>
\ No newline at end of file
diff --git a/404.php b/404.php
index 3565ba9..c9edda5 100755
--- a/404.php
+++ b/404.php
@@ -5,6 +5,13 @@
  * @package cornerstone
  */
 get_header(); ?>
+<?php
+$private = get_post_meta(get_queried_object()->ID, 'uc-private', true);
+if($private == 'admins' || $private == 'users' || $private == 'list' || $private == 'netids'){
+	$private = true;
+	echo 'This is a private page';
+}
+?>
 <div id="error404">
 	<div class="row">
 		<div class="col-sm-12">
diff --git a/functions.php b/functions.php
index 5b5b588..e3d65e8 100644
--- a/functions.php
+++ b/functions.php
@@ -115,24 +115,24 @@ function cs_widgets_init() {
  */
 require get_template_directory() . '/inc/customizer.php';
 
-/**
+/** 
 * New nav walkers
 */
 require get_template_directory() . '/inc/nav-walker.php';
 require get_template_directory() . '/inc/nav-drop-multi-walker.php';
 require get_template_directory() . '/inc/nav-tabs-walker.php';
 
-/**
+/** 
 * Bootstrap the comment form.
 */
 require get_template_directory() . '/inc/bootstrap-forms.php';
 
-/**
+/** 
 * Custom site settings
 */
 require get_template_directory() . '/inc/settings.php';
 
-/**
+/** 
 * Bootstrap Whitelist
 */
 require get_template_directory() . '/inc/bootstrap-whitelist.php';
@@ -175,13 +175,13 @@ function hale_main_nav_fallback($args) {
 			} else {
 				echo '<div'.$attributes.'>';
 			}
-
+			
 		}
 		$attributes = (!empty($args['menu_class'])?' class="'.$args['menu_class'].'"':'');
 		$attributes .= (!empty($args['menu_id'])?' id="'.$args['menu_id'].'"':'');
 		echo '<ul'.$attributes.'>';
 		if($data->length > 0) {
-			foreach($data as $item) {
+			foreach($data as $item) {		
 				echo $item->ownerDocument->saveXML($item);//saveHTML wouldn't accept it as paramater.
 			}
 		}
@@ -193,9 +193,9 @@ function hale_main_nav_fallback($args) {
 			} else {
 				echo '</div>';
 			}
-
+			
 		}
-	}
+	}	
 	return;
 }
 
@@ -237,21 +237,4 @@ function cornerstone_show_people(){
 };
 add_action( 'admin_init', 'cornerstone_show_people' );
 
-function uc_redirect_403() {
-	if( get_query_var( 'is_403' ) == true ){
-		global $wp_query;
-
-		status_header(403);
-		$wp_query->is_404=false;
-
-		add_filter( 'wp_title', function( $title='', $sep='' ){
-			 return "Forbidden | ".get_bloginfo('name');
-		});
-		get_template_part('403');
-		exit;
-	}
-}
-
-add_action( 'template_redirect', 'uc_redirect_403' );
-
 ?>
\ No newline at end of file