diff --git a/livesupport/src/modules/storageServer/var/Backup.php b/livesupport/src/modules/storageServer/var/Backup.php index 35a7707f8..c42cef954 100755 --- a/livesupport/src/modules/storageServer/var/Backup.php +++ b/livesupport/src/modules/storageServer/var/Backup.php @@ -317,7 +317,7 @@ class Backup { */ function setEnviroment($createDir=false) { if ($this->loglevel=='debug') { - $this->addLogItem("-I- ".date("Ymd-H:i:s")." setEnviroment - createDirs:$createDirs\n"); + $this->addLogItem("-I- ".date("Ymd-H:i:s")." setEnviroment - createDirs:$createDir\n"); } # create a temporary directories if (is_null($this->token) && $createDir) { diff --git a/livesupport/src/modules/storageServer/var/DataEngine.php b/livesupport/src/modules/storageServer/var/DataEngine.php index a1b584fcb..d4ac4e218 100644 --- a/livesupport/src/modules/storageServer/var/DataEngine.php +++ b/livesupport/src/modules/storageServer/var/DataEngine.php @@ -281,16 +281,19 @@ class DataEngine{ function _localGenSearch($criteria, $limit=0, $offset=0, $brFldNs=NULL, $brFld=NULL) { - $filetype = strtolower($criteria['filetype']); + $filetype = (isset($criteria['filetype']) ? $criteria['filetype'] : 'all'); + $filetype = strtolower($filetype); if(!array_key_exists($filetype, $this->filetypes)){ return PEAR::raiseError( 'DataEngine::_localGenSearch: unknown filetype in search criteria' ); } $filetype = $this->filetypes[$filetype]; - $operator = strtolower($criteria['operator']); + $operator = (isset($criteria['operator']) ? $criteria['operator'] : 'and'); + $operator = strtolower($operator); $desc = (isset($criteria['desc']) ? $criteria['desc'] : NULL); - $whereArr = $this->_makeWhereArr($criteria['conditions']); + $conditions = (isset($criteria['conditions']) ? $criteria['conditions'] : array()); + $whereArr = $this->_makeWhereArr($conditions); $orderbyQn = (isset($criteria['orderby']) ? $criteria['orderby'] : NULL); $obSplitQn = XML_Util::splitQualifiedName($orderbyQn);