From bae4b0cf172bfa54750084e94edf847e95438ad1 Mon Sep 17 00:00:00 2001
From: tswagger <tswagger@smumn.edu>
Date: Thu, 7 May 2015 11:26:18 -0500
Subject: [PATCH] Modified keep_infos() and keep_errors() with options

Modified keep_infos() and keep_errors() to include non-flash data values on optional boolean parameter.
---
 application/libraries/Aauth.php | 45 ++++++++++++++++++++++++---------
 1 file changed, 33 insertions(+), 12 deletions(-)

diff --git a/application/libraries/Aauth.php b/application/libraries/Aauth.php
index 33841e1..a2cd002 100644
--- a/application/libraries/Aauth.php
+++ b/application/libraries/Aauth.php
@@ -1690,13 +1690,24 @@ class Aauth {
 
 	/**
 	 * Keep Errors
-	 * keeps the flash data flash data
-	 * Benefitial by using Ajax Requests
-	 * more info about flash data
-	 * http://ellislab.com/codeigniter/user-guide/libraries/sessions.html
+	 *
+	 * Keeps the flashdata errors for one more page refresh.  Optionally adds the default errors into the
+	 * flashdata list.  This should be called last in your controller, and with care as it could continue
+	 * to revive all errors and not let them expire as intended.
+	 * Benefitial when using Ajax Requests
+	 * @see http://ellislab.com/codeigniter/user-guide/libraries/sessions.html
+	 * @param boolean $include_non_flash true if it should stow basic errors as flashdata (default = false)
 	 */
-	public function keep_errors(){
-		$this->CI->session->keep_flashdata('errors');
+	public function keep_errors($include_non_flash = FALSE)
+	{
+		// NOTE: keep_flashdata() overwrites anything new that has been added to flashdata so we are manually reviving flash data
+		// $this->CI->session->keep_flashdata('errors');
+
+		if($include_non_flash) {
+			$this->flash_errors = array_merge($this->flash_errors, $this->errors);
+		}
+		$this->flash_errors = array_merge($this->flash_errors, (array)$this->CI->session->flashdata('errors'));
+		$this->CI->session->set_flashdata('errors', $this->flash_errors);
 	}
 
 	//tested
@@ -1766,16 +1777,26 @@ class Aauth {
 
 	/**
 	 * Keep Infos
-	 * keeps the flash data
+	 *
+	 * Keeps the flashdata infos for one more page refresh.  Optionally adds the default infos into the
+	 * flashdata list.  This should be called last in your controller, and with care as it could continue
+	 * to revive all infos and not let them expire as intended.
 	 * Benefitial by using Ajax Requests
-	 * more info about flash data
-	 * http://ellislab.com/codeigniter/user-guide/libraries/sessions.html
+	 * @see http://ellislab.com/codeigniter/user-guide/libraries/sessions.html
+	 * @param boolean $include_non_flash true if it should stow basic infos as flashdata (default = false)
 	 */
-	public function keep_infos(){
-		$this->CI->session->keep_flashdata('infos');
+	public function keep_infos($include_non_flash = FALSE)
+	{
+		// NOTE: keep_flashdata() overwrites anything new that has been added to flashdata so we are manually reviving flash data
+		// $this->CI->session->keep_flashdata('infos');
+
+		if($include_non_flash) {
+			$this->flash_infos = array_merge($this->flash_infos, $this->infos);
+		}
+		$this->flash_infos = array_merge($this->flash_infos, (array)$this->CI->session->flashdata('infos'));
+		$this->CI->session->set_flashdata('infos', $this->flash_infos);
 	}
 
-	//tested
 	/**
 	 * Get Info Array
 	 * Return array of info