From 7223abe4588cb3a18908d14d750ffce19e7e3e46 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Thu, 7 Jul 2016 08:49:22 -0700
Subject: [PATCH] Fixes #1766 user password - getModel() issue.

---
 e107_admin/footer.php      | 62 --------------------------------------
 e107_handlers/admin_ui.php | 31 +++++++++++++++----
 2 files changed, 25 insertions(+), 68 deletions(-)

diff --git a/e107_admin/footer.php b/e107_admin/footer.php
index 7fc7279f8..dacce49e9 100644
--- a/e107_admin/footer.php
+++ b/e107_admin/footer.php
@@ -447,68 +447,6 @@ $page = $ehd->getOutput();
 echo $page;
 
 
-/*
-
-
-$etag = md5($page);
-
-if (isset($_SERVER['HTTP_IF_NONE_MATCH']))
-{
-	$IF_NONE_MATCH = str_replace('"','',$_SERVER['HTTP_IF_NONE_MATCH']);
-	
-	$data = "IF_NON_MATCH = ".$IF_NONE_MATCH;
-	$data .= "\nEtag = ".$etag;
-	//file_put_contents(e_ADMIN."etag_log.txt",$data);
-
-	
-	if($IF_NONE_MATCH == $etag || ($IF_NONE_MATCH == ($etag."-gzip")))
-	{
-		header('HTTP/1.1 304 Not Modified');
-		exit();	
-	}
-}
-
-
-header("Cache-Control: max-age=5,no-cache",true);	// XXX testing 'always on' state for now. 
-if(!defined('e_NOCACHE'))
-{
-	// header("Cache-Control: must-revalidate");	
-}
-
-
-$pref['compression_level'] = 6;
-if (strstr(varset($_SERVER["HTTP_ACCEPT_ENCODING"], ""), "gzip"))
-{
-//	$browser_support = true;
-}
-if (ini_get("zlib.output_compression") == false && function_exists("gzencode"))
-{
-//	$server_support = true;
-}
-if (varset($pref['compress_output'], false) && $server_support == true && $browser_support == true)
-{
-	$level = intval($pref['compression_level']);
-	header("ETag: \"{$etag}-gzip\"");
-	$page = gzencode($page, $level);
-	header("Content-Encoding: gzip", true);
-	header("Content-Length: ".strlen($page), true);
-	echo $page;
-}
-else
-{
-	if($browser_support==TRUE) 
-	{
-		header("ETag: \"{$etag}-gzip\"");	
-	}
-	else
-	{
-		header("ETag: \"{$etag}\"");	
-	}
-	
-	header("Content-Length: ".strlen($page), true);
-	echo $page;
-}*/
-
 unset($In_e107_Footer);
 $e107_Clean_Exit = TRUE; // For registered shutdown function -- let it know all is well!
 ?>
\ No newline at end of file
diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php
index fa8a48f0d..023ac4164 100644
--- a/e107_handlers/admin_ui.php
+++ b/e107_handlers/admin_ui.php
@@ -2770,15 +2770,34 @@ class e_admin_controller_ui extends e_admin_controller
 			$this->_setModel();
 		}
 
-		if($this->getQuery('action') == 'list') // allow for use of getModel() at all times.
-		{
-			return $this->getListModel();
-		}
-
-
 		return $this->_model;
 	}
 
+
+	/**
+	 * Alias for getModel()->get and getListModel()->get().
+	 * May be used inside field-method in read/write mode.
+	 *
+	 * @param string $key
+	 * @return mixed|null - current value of the chosen db field.
+	 */
+	public function getFieldVar($key = null)
+	{
+		if(empty($key))
+		{
+			return null;
+		}
+
+		if($this->getQuery('action') == 'list')
+		{
+			return $this->getListModel()->get($key);
+		}
+
+		return $this->getModel()->get($key);
+
+	}
+
+
 	/**
 	 * Set controller model
 	 * @param e_admin_model $model