mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 13:47:31 +02:00
Code Issues Releases Wiki Activity

Fixes #1766 user password - getModel() issue.

Browse Source
This commit is contained in:
Cameron
2016-07-07 08:49:22 -07:00
parent 99a3c0fac2
commit 7223abe458
2 changed files with 25 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
e107_admin/footer.php
View File

@@ -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!
?>

31
e107_handlers/admin_ui.php
View File

@@ -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