mirror of
https://github.com/ezyang/htmlpurifier.git
synced 2025-08-03 20:58:11 +02:00
PSR-2 reformatting PHPDoc corrections
With minor corrections. Signed-off-by: Marcus Bointon <marcus@synchromedia.co.uk> Signed-off-by: Edward Z. Yang <ezyang@mit.edu>
This commit is contained in:
committed by
Edward Z. Yang
parent
19eee14899
commit
fac747bdbd
@@ -1,83 +1,160 @@
|
||||
<?php
|
||||
|
||||
class HTMLPurifier_DefinitionCache_Serializer extends
|
||||
HTMLPurifier_DefinitionCache
|
||||
class HTMLPurifier_DefinitionCache_Serializer extends HTMLPurifier_DefinitionCache
|
||||
{
|
||||
|
||||
public function add($def, $config) {
|
||||
if (!$this->checkDefType($def)) return;
|
||||
/**
|
||||
* @param HTMLPurifier_Definition $def
|
||||
* @param HTMLPurifier_Config $config
|
||||
* @return int|bool
|
||||
*/
|
||||
public function add($def, $config)
|
||||
{
|
||||
if (!$this->checkDefType($def)) {
|
||||
return;
|
||||
}
|
||||
$file = $this->generateFilePath($config);
|
||||
if (file_exists($file)) return false;
|
||||
if (!$this->_prepareDir($config)) return false;
|
||||
if (file_exists($file)) {
|
||||
return false;
|
||||
}
|
||||
if (!$this->_prepareDir($config)) {
|
||||
return false;
|
||||
}
|
||||
return $this->_write($file, serialize($def), $config);
|
||||
}
|
||||
|
||||
public function set($def, $config) {
|
||||
if (!$this->checkDefType($def)) return;
|
||||
/**
|
||||
* @param HTMLPurifier_Definition $def
|
||||
* @param HTMLPurifier_Config $config
|
||||
* @return int|bool
|
||||
*/
|
||||
public function set($def, $config)
|
||||
{
|
||||
if (!$this->checkDefType($def)) {
|
||||
return;
|
||||
}
|
||||
$file = $this->generateFilePath($config);
|
||||
if (!$this->_prepareDir($config)) return false;
|
||||
if (!$this->_prepareDir($config)) {
|
||||
return false;
|
||||
}
|
||||
return $this->_write($file, serialize($def), $config);
|
||||
}
|
||||
|
||||
public function replace($def, $config) {
|
||||
if (!$this->checkDefType($def)) return;
|
||||
/**
|
||||
* @param HTMLPurifier_Definition $def
|
||||
* @param HTMLPurifier_Config $config
|
||||
* @return int|bool
|
||||
*/
|
||||
public function replace($def, $config)
|
||||
{
|
||||
if (!$this->checkDefType($def)) {
|
||||
return;
|
||||
}
|
||||
$file = $this->generateFilePath($config);
|
||||
if (!file_exists($file)) return false;
|
||||
if (!$this->_prepareDir($config)) return false;
|
||||
if (!file_exists($file)) {
|
||||
return false;
|
||||
}
|
||||
if (!$this->_prepareDir($config)) {
|
||||
return false;
|
||||
}
|
||||
return $this->_write($file, serialize($def), $config);
|
||||
}
|
||||
|
||||
public function get($config) {
|
||||
/**
|
||||
* @param HTMLPurifier_Config $config
|
||||
* @return bool|HTMLPurifier_Config
|
||||
*/
|
||||
public function get($config)
|
||||
{
|
||||
$file = $this->generateFilePath($config);
|
||||
if (!file_exists($file)) return false;
|
||||
if (!file_exists($file)) {
|
||||
return false;
|
||||
}
|
||||
return unserialize(file_get_contents($file));
|
||||
}
|
||||
|
||||
public function remove($config) {
|
||||
/**
|
||||
* @param HTMLPurifier_Config $config
|
||||
* @return bool
|
||||
*/
|
||||
public function remove($config)
|
||||
{
|
||||
$file = $this->generateFilePath($config);
|
||||
if (!file_exists($file)) return false;
|
||||
if (!file_exists($file)) {
|
||||
return false;
|
||||
}
|
||||
return unlink($file);
|
||||
}
|
||||
|
||||
public function flush($config) {
|
||||
if (!$this->_prepareDir($config)) return false;
|
||||
/**
|
||||
* @param HTMLPurifier_Config $config
|
||||
* @return bool
|
||||
*/
|
||||
public function flush($config)
|
||||
{
|
||||
if (!$this->_prepareDir($config)) {
|
||||
return false;
|
||||
}
|
||||
$dir = $this->generateDirectoryPath($config);
|
||||
$dh = opendir($dir);
|
||||
$dh = opendir($dir);
|
||||
while (false !== ($filename = readdir($dh))) {
|
||||
if (empty($filename)) continue;
|
||||
if ($filename[0] === '.') continue;
|
||||
if (empty($filename)) {
|
||||
continue;
|
||||
}
|
||||
if ($filename[0] === '.') {
|
||||
continue;
|
||||
}
|
||||
unlink($dir . '/' . $filename);
|
||||
}
|
||||
}
|
||||
|
||||
public function cleanup($config) {
|
||||
if (!$this->_prepareDir($config)) return false;
|
||||
/**
|
||||
* @param HTMLPurifier_Config $config
|
||||
* @return bool
|
||||
*/
|
||||
public function cleanup($config)
|
||||
{
|
||||
if (!$this->_prepareDir($config)) {
|
||||
return false;
|
||||
}
|
||||
$dir = $this->generateDirectoryPath($config);
|
||||
$dh = opendir($dir);
|
||||
$dh = opendir($dir);
|
||||
while (false !== ($filename = readdir($dh))) {
|
||||
if (empty($filename)) continue;
|
||||
if ($filename[0] === '.') continue;
|
||||
if (empty($filename)) {
|
||||
continue;
|
||||
}
|
||||
if ($filename[0] === '.') {
|
||||
continue;
|
||||
}
|
||||
$key = substr($filename, 0, strlen($filename) - 4);
|
||||
if ($this->isOld($key, $config)) unlink($dir . '/' . $filename);
|
||||
if ($this->isOld($key, $config)) {
|
||||
unlink($dir . '/' . $filename);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Generates the file path to the serial file corresponding to
|
||||
* the configuration and definition name
|
||||
* @param HTMLPurifier_Config $config
|
||||
* @return string
|
||||
* @todo Make protected
|
||||
*/
|
||||
public function generateFilePath($config) {
|
||||
public function generateFilePath($config)
|
||||
{
|
||||
$key = $this->generateKey($config);
|
||||
return $this->generateDirectoryPath($config) . '/' . $key . '.ser';
|
||||
}
|
||||
|
||||
/**
|
||||
* Generates the path to the directory contain this cache's serial files
|
||||
* @param HTMLPurifier_Config $config
|
||||
* @return string
|
||||
* @note No trailing slash
|
||||
* @todo Make protected
|
||||
*/
|
||||
public function generateDirectoryPath($config) {
|
||||
public function generateDirectoryPath($config)
|
||||
{
|
||||
$base = $this->generateBaseDirectoryPath($config);
|
||||
return $base . '/' . $this->type;
|
||||
}
|
||||
@@ -85,9 +162,12 @@ class HTMLPurifier_DefinitionCache_Serializer extends
|
||||
/**
|
||||
* Generates path to base directory that contains all definition type
|
||||
* serials
|
||||
* @param HTMLPurifier_Config $config
|
||||
* @return mixed|string
|
||||
* @todo Make protected
|
||||
*/
|
||||
public function generateBaseDirectoryPath($config) {
|
||||
public function generateBaseDirectoryPath($config)
|
||||
{
|
||||
$base = $config->get('Cache.SerializerPath');
|
||||
$base = is_null($base) ? HTMLPURIFIER_PREFIX . '/HTMLPurifier/DefinitionCache/Serializer' : $base;
|
||||
return $base;
|
||||
@@ -95,12 +175,13 @@ class HTMLPurifier_DefinitionCache_Serializer extends
|
||||
|
||||
/**
|
||||
* Convenience wrapper function for file_put_contents
|
||||
* @param $file File name to write to
|
||||
* @param $data Data to write into file
|
||||
* @param $config Config object
|
||||
* @return Number of bytes written if success, or false if failure.
|
||||
* @param string $file File name to write to
|
||||
* @param string $data Data to write into file
|
||||
* @param HTMLPurifier_Config $config
|
||||
* @return int|bool Number of bytes written if success, or false if failure.
|
||||
*/
|
||||
private function _write($file, $data, $config) {
|
||||
private function _write($file, $data, $config)
|
||||
{
|
||||
$result = file_put_contents($file, $data);
|
||||
if ($result !== false) {
|
||||
// set permissions of the new file (no execute)
|
||||
@@ -116,10 +197,11 @@ class HTMLPurifier_DefinitionCache_Serializer extends
|
||||
|
||||
/**
|
||||
* Prepares the directory that this type stores the serials in
|
||||
* @param $config Config object
|
||||
* @return True if successful
|
||||
* @param HTMLPurifier_Config $config
|
||||
* @return bool True if successful
|
||||
*/
|
||||
private function _prepareDir($config) {
|
||||
private function _prepareDir($config)
|
||||
{
|
||||
$directory = $this->generateDirectoryPath($config);
|
||||
$chmod = $config->get('Cache.SerializerPermissions');
|
||||
if (!$chmod) {
|
||||
@@ -128,9 +210,11 @@ class HTMLPurifier_DefinitionCache_Serializer extends
|
||||
if (!is_dir($directory)) {
|
||||
$base = $this->generateBaseDirectoryPath($config);
|
||||
if (!is_dir($base)) {
|
||||
trigger_error('Base directory '.$base.' does not exist,
|
||||
trigger_error(
|
||||
'Base directory ' . $base . ' does not exist,
|
||||
please create or change using %Cache.SerializerPath',
|
||||
E_USER_WARNING);
|
||||
E_USER_WARNING
|
||||
);
|
||||
return false;
|
||||
} elseif (!$this->_testPermissions($base, $chmod)) {
|
||||
return false;
|
||||
@@ -147,18 +231,23 @@ class HTMLPurifier_DefinitionCache_Serializer extends
|
||||
/**
|
||||
* Tests permissions on a directory and throws out friendly
|
||||
* error messages and attempts to chmod it itself if possible
|
||||
* @param $dir Directory path
|
||||
* @param $chmod Permissions
|
||||
* @return True if directory writable
|
||||
* @param string $dir Directory path
|
||||
* @param int $chmod Permissions
|
||||
* @return bool True if directory is writable
|
||||
*/
|
||||
private function _testPermissions($dir, $chmod) {
|
||||
private function _testPermissions($dir, $chmod)
|
||||
{
|
||||
// early abort, if it is writable, everything is hunky-dory
|
||||
if (is_writable($dir)) return true;
|
||||
if (is_writable($dir)) {
|
||||
return true;
|
||||
}
|
||||
if (!is_dir($dir)) {
|
||||
// generally, you'll want to handle this beforehand
|
||||
// so a more specific error message can be given
|
||||
trigger_error('Directory '.$dir.' does not exist',
|
||||
E_USER_WARNING);
|
||||
trigger_error(
|
||||
'Directory ' . $dir . ' does not exist',
|
||||
E_USER_WARNING
|
||||
);
|
||||
return false;
|
||||
}
|
||||
if (function_exists('posix_getuid')) {
|
||||
@@ -166,7 +255,9 @@ class HTMLPurifier_DefinitionCache_Serializer extends
|
||||
if (fileowner($dir) === posix_getuid()) {
|
||||
// we can chmod it ourselves
|
||||
$chmod = $chmod | 0700;
|
||||
if (chmod($dir, $chmod)) return true;
|
||||
if (chmod($dir, $chmod)) {
|
||||
return true;
|
||||
}
|
||||
} elseif (filegroup($dir) === posix_getgid()) {
|
||||
$chmod = $chmod | 0070;
|
||||
} else {
|
||||
@@ -174,18 +265,21 @@ class HTMLPurifier_DefinitionCache_Serializer extends
|
||||
// need to give global permissions
|
||||
$chmod = $chmod | 0777;
|
||||
}
|
||||
trigger_error('Directory '.$dir.' not writable, '.
|
||||
trigger_error(
|
||||
'Directory ' . $dir . ' not writable, ' .
|
||||
'please chmod to ' . decoct($chmod),
|
||||
E_USER_WARNING);
|
||||
E_USER_WARNING
|
||||
);
|
||||
} else {
|
||||
// generic error message
|
||||
trigger_error('Directory '.$dir.' not writable, '.
|
||||
trigger_error(
|
||||
'Directory ' . $dir . ' not writable, ' .
|
||||
'please alter file permissions',
|
||||
E_USER_WARNING);
|
||||
E_USER_WARNING
|
||||
);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// vim: et sw=4 sts=4
|
||||
|
Reference in New Issue
Block a user