diff --git a/livesupport/src/modules/storageServer/var/LsPlaylist.php b/livesupport/src/modules/storageServer/var/LsPlaylist.php index 26929e066..f4a36bf85 100644 --- a/livesupport/src/modules/storageServer/var/LsPlaylist.php +++ b/livesupport/src/modules/storageServer/var/LsPlaylist.php @@ -28,6 +28,8 @@ ------------------------------------------------------------------------------*/ +require_once "Playlist.php"; + define('INDCH', ' '); define('AC_URL_RELPATH', '../audioClip/'); define('PL_URL_RELPATH', '../playlist/'); diff --git a/livesupport/src/modules/storageServer/var/Validator.php b/livesupport/src/modules/storageServer/var/Validator.php index 2777a1664..3e71bfc14 100644 --- a/livesupport/src/modules/storageServer/var/Validator.php +++ b/livesupport/src/modules/storageServer/var/Validator.php @@ -130,7 +130,7 @@ class Validator{ if(isset($formTree[$category]['regexp'])){ // echo "XXX {$formTree[$fname]['regexp']} / ".$node->content."\n"; if(!preg_match("|{$formTree[$category]['regexp']}|", $value)) - return $this->_err(VAL_CONTENT, $category); + return $this->_err(VAL_CONTENT, "$category/$value"); } } @@ -155,7 +155,7 @@ class Validator{ if(isset($formTree[$fname]['regexp'])){ // echo "XXX {$formTree[$fname]['regexp']} / ".$node->content."\n"; if(!preg_match("|{$formTree[$fname]['regexp']}|", $node->content)) - return $this->_err(VAL_CONTENT, $fname); + return $this->_err(VAL_CONTENT, "$fname/{$node->content}"); } // validate attributes: $ra = $this->validateAttributes($node, $fname);