makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

I thought I had committed this already :-/

Browse source 
(fixed slashing of data, added file locking)


git-svn-id: file:///svn/phpbb/trunk@3436 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Ludovic Arnaud 2003-01-31 01:43:09 +00:00
parent 1c391dc290
commit 5b0315305f
1 changed files with 32 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
phpBB/includes/acm/cache_file.php
View file

@ -99,10 +99,6 @@ class acm
if ($expire_time > 0) if ($expire_time > 0)
{ {
if (!isset($this->vars[$varname]))
{
return FALSE;
}
if ($this->vars_ts[$varname] <= time() - $expire_time) if ($this->vars_ts[$varname] <= time() - $expire_time)
{ {
$this->destroy($varname); $this->destroy($varname);
@ -131,9 +127,13 @@ class acm
global $phpEx; global $phpEx;
$file = '<?php $this->vars=' . $this->format_array($this->vars) . ";\n\$this->vars_ts=" . $this->format_array($this->vars_ts) . ' ?>'; $file = '<?php $this->vars=' . $this->format_array($this->vars) . ";\n\$this->vars_ts=" . $this->format_array($this->vars_ts) . ' ?>';
$fp = fopen($this->cache_dir . 'global.' . $phpEx, 'wb'); if ($fp = @fopen($this->cache_dir . 'global.' . $phpEx, 'wb'))
fwrite($fp, $file); {
fclose($fp); @flock($fp, LOCK_EX);
fwrite($fp, $file);
@flock($fp, LOCK_UN);
fclose($fp);
}
} }
function format_array($array) function format_array($array)
@ -155,7 +155,7 @@ class acm
} }
else else
{ {
$lines[] = "'$k'=>'" . str_replace('\\\\', '\\\\\\\\', str_replace("'", "\'", $v)) . "'"; $lines[] = "'$k'=>'" . str_replace("'", "\'", str_replace('\\', '\\\\', $v)) . "'";
} }
} }
return 'array(' . implode(',', $lines) . ')'; return 'array(' . implode(',', $lines) . ')';
@ -182,28 +182,32 @@ class acm
function sql_save($query, $result) function sql_save($query, $result)
{ {
global $db, $phpEx; global $db, $phpEx;
$fp = fopen($this->cache_dir . md5($query) . '.' . $phpEx, 'wb'); if (@$fp = fopen($this->cache_dir . md5($query) . '.' . $phpEx, 'wb'))
$lines = array();
$query_id = 'Cache id #' . count($this->sql_rowset);
$this->sql_rowset[$query_id] = array();
$this->sql_rowset_index[$query_id] = 0;
$db->query_result = $query_id;
while ($row = $db->sql_fetchrow($result))
{ {
$this->sql_rowset[$query_id][] = $row; @flock($fp, LOCK_EX);
$line = 'array('; $lines = array();
foreach ($row as $key => $val) $query_id = 'Cache id #' . count($this->sql_rowset);
$this->sql_rowset[$query_id] = array();
$this->sql_rowset_index[$query_id] = 0;
$db->query_result = $query_id;
while ($row = $db->sql_fetchrow($result))
{ {
$line .= "'$key'=>'" . str_replace('\\\\', '\\\\\\\\', str_replace("'", "\'", $val)) . "',"; $this->sql_rowset[$query_id][] = $row;
}
$lines[] = substr($line, 0, -1) . ')';
}
fwrite($fp, "<?php\n\n/*\n$query\n*/\n\n\$rowset = array(" . implode(',', $lines) . ') ?>'); $line = 'array(';
fclose($fp); foreach ($row as $key => $val)
{
$line .= "'$key'=>'" . str_replace("'", "\'", str_replace('\\', '\\\\', $val)) . "',";
}
$lines[] = substr($line, 0, -1) . ')';
}
fwrite($fp, "<?php\n\n/*\n$query\n*/\n\n\$rowset = array(" . implode(',', $lines) . ') ?>');
@flock($fp, LOCK_UN);
fclose($fp);
}
} }
function sql_exists($query_id) function sql_exists($query_id)
@ -213,6 +217,8 @@ class acm
function sql_fetchrow($query_id) function sql_fetchrow($query_id)
{ {
//return array_shift($this->sql_rowset[$query_id]);
if (!isset($this->sql_rowset[$query_id][$this->sql_rowset_index[$query_id]])) if (!isset($this->sql_rowset[$query_id][$this->sql_rowset_index[$query_id]]))
{ {
return false; return false;