Initiali implementation handles only file, stream, and syslog drivers.
(Yes, I know that file is just a subset of stream, but 95% of those
installing IMP won't know that, and logging to file is far and away the
most popular choice). No support for custom log timestamps/format
either.
$forums = &Agora_Messages::singleton($scope);
$id = $forums->getForumId($forum_name);
if ($id instanceof PEAR_Error) {
- Horde::logMessage($id, __LINE__, __FILE__, PEAR_LOG_ERR);
+ Horde::logMessage($id, 'ERR');
return false;
}
$forums = &Agora_Messages::singleton($scope, $id);
$result = $forums->deleteForum($id);
if ($result instanceof PEAR_Error) {
- Horde::logMessage($result, __LINE__, __FILE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return false;
}
return true;
if (($forum_id = $forums->getForumId($forum)) instanceof PEAR_Error) {
// In case of error, just return zero but log the error - so
// the calling app always gets an array with all the image ids.
- Horde::logMessage($forum_id, __FILE__, __LINE__, 'PEAR_LOG_ERR');
+ Horde::logMessage($forum_id, 'ERR');
$results[$forum] = 0;
} elseif (empty($forum_id)) {
$results[$forum] = 0;
$result = $statement->execute($params);
$statement->free();
if ($result instanceof PEAR_Error) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$result = $statement->execute($params);
$statement->free();
if ($result instanceof PEAR_Error) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$result = $statement->execute($file_data);
$statement->free();
if ($result instanceof PEAR_Error) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$attachments = 1;
. ' WHERE message_id = ' . (int)$info['message_id'];
$result = $this->_write_db->query($sql);
if ($result instanceof PEAR_Error) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
}
. $this->_threads_table . ' WHERE message_id = ?';
$message = $this->_db->getRow($sql, null, array($message_id));
if ($message instanceof PEAR_Error) {
- Horde::logMessage($message, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($message, 'ERR');
return $message;
}
$thread_id = $this->_db->getOne($sql, null, array($message_id));
if ($thread_id instanceof PEAR_Error) {
- Horde::logMessage($thread_id, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($thread_id, 'ERR');
return $thread_id;
}
$result = $this->_write_db->query($sql);
if ($result instanceof PEAR_Error) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
}
$sql .= ', message_modifystamp = ' . $_SERVER['REQUEST_TIME'] . ' WHERE message_id = ' . (int)$thread_id;
- Horde::logMessage('Query by Agora_Messages::_sequence(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Query by Agora_Messages::_sequence(): ' . $sql, 'DEBUG')
return $this->_write_db->query($sql);
}
$sql = 'DELETE FROM ' . $this->_threads_table . ' WHERE message_thread = ' . (int)$thread_id;
$result = $this->_write_db->query($sql);
if ($result instanceof PEAR_Error) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$sql = 'DELETE FROM ' . $this->_threads_table . ' WHERE forum_id = ' . (int)$this->_forum_id;
$result = $this->_write_db->query($sql);
if ($result instanceof PEAR_Error) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$sql = 'SELECT file_id, file_name, file_size, file_type FROM agora_files WHERE message_id = ?';
$files = $this->_db->getAssoc($sql, null, array($message_id));
if ($files instanceof PEAR_Error || empty($files)) {
- Horde::logMessage($files, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($files, 'ERR');
return $files;
}
isset($info['forum_distribution_address']) ? $info['forum_distribution_address'] : '',
$info['forum_id']);
- Horde::logMessage('SQL Query by Agora_Message::saveForum(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by Agora_Message::saveForum(): ' . $sql, 'DEBUG');
$statement = $this->_write_db->prepare($sql);
if ($statement instanceof PEAR_Error) {
return $statement;
$messages = $this->_db->getAssoc($bind[0], null, $bind[1], null, MDB2_FETCHMODE_ASSOC, true);
if ($messages instanceof PEAR_Error) {
- Horde::logMessage($messages, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($messages, 'ERR');
return $messages;
}
$messages = $this->_db->getAssoc($bind[0], null, $bind[1], null, MDB2_FETCHMODE_ASSOC, true);
if ($messages instanceof PEAR_Error) {
- Horde::logMessage($messages, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($messages, 'ERR');
return $messages;
}
$messages = $this->_db->getAssoc($bind[0], null, $bind[1], null, MDB2_FETCHMODE_ASSOC, true);
if ($messages instanceof PEAR_Error) {
- Horde::logMessage($messages, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($messages, 'ERR');
return $messages;
}
$messages = $this->_db->getAssoc($bind[0], null, $bind[1], null, MDB2_FETCHMODE_ASSOC, true);
if ($messages instanceof PEAR_Error) {
- Horde::logMessage($messages, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($messages, 'ERR');
return $messages;
}
if ($ret instanceof PEAR_Error) {
$error = _("Couldn't read command-line options.");
- Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($error, 'DEBUG');
$cli->fatal($error);
}
$image->createView('screen');
$result = $faces->getFromPicture($image_id, $autocreate);
} catch (Horde_Exception $e) {
- Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
$result = null;
}
}
Ansel_Faces::getVFSPath($face['image_id']) . 'faces',
$face_id . Ansel_Faces::getExtension());
} catch (VFS_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
exit;
}
header('Content-type: image/' . $GLOBALS['conf']['image']['type']);
$galleryId = null;
$error = sprintf(_("The gallery \"%s\" couldn't be created: %s"),
$gallery_name, $gallery->getMessage());
- Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($error, 'ERR');
$notification->push($error, 'horde.error');
} else {
$galleryId = $gallery->getId();
$msg = sprintf(_("The gallery \"%s\" was created successfully."),
$gallery_name);
- Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($msg, 'DEBUG');
$notification->push($msg, 'horde.success');
}
}
list($x1, $y1, $x2, $y2) = explode('.', $params);
$result = $image->crop($x1, $y1, $x2, $y2);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
$notification->push($result->getMessage(), 'horde.error');
$error = true;
}
try {
$image->createView('mini', 'ansel_default');
} catch (Horde_Exception $e) {
- Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
exit;
}
$filename = $ansel_vfs->readFile($image->getVFSPath('mini'), $image->getVFSName('mini'));
try {
$image->createView('prettythumb', $style);
} catch (Horde_Exception $e) {
- Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
exit;
}
$filename = $ansel_vfs->readFile($image->getVFSPath('prettythumb', $style), $image->getVFSName('prettythumb'));
try {
$image->createView('screen', 'ansel_default');
} catch (Horde_Exception $e) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
exit;
}
$filename = $ansel_vfs->readFile($image->getVFSPath('screen'), $image->getVFSName('screen'));
try {
$image->createView('thumb', 'ansel_default');
} catch (Horde_Exception $e) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
exit;
}
$filename = $ansel_vfs->readFile($image->getVFSPath('thumb'), $image->getVFSName('thumb'));
if (!isset($_SESSION['ansel']['ajax_locationac'])) {
$results = $GLOBALS['ansel_storage']->searchLocations();
if ($results instanceof PEAR_Error) {
- Horde::logMessage($results, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($results, 'ERR');
} else {
$_SESSION['ansel']['ajax_locationac'] = (count($results) > 50);
}
}
$locs = $GLOBALS['ansel_storage']->searchLocations($input);
if (is_a($locs, 'PEAR_Error')) {
- Horde::logMessage($locs->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($locs->getMessage(), 'ERR');
$locs = new StdClass();
}
if (!count($locs)) {
try {
$image = $ansel_storage->getImage($imageId);
} catch (Ansel_Exception $e) {
- Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
return Ansel::getErrorImage($view);
}
try {
isset($image['description']) &&
isset($image['data']) &&
isset($image['type'])) {
- Horde::logMessage(sprintf("Receiving image %s in saveImage() with a raw filesize of %i", $image['filename'], strlen($image['data'])), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf("Receiving image %s in saveImage() with a raw filesize of %i", $image['filename'], strlen($image['data'])), 'DEBUG');
$image_data = array('image_filename' => $image['filename'],
'image_caption' => $image['description'],
'image_type' => $image['type'],
'data' => $this->_getImageData($image['data'], $encoding, $compression, true));
} else {
- Horde::logMessage(sprintf("Receiving image %s in saveImage() with a raw filesize of %i", $image['file'], filesize($image['file'])), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf("Receiving image %s in saveImage() with a raw filesize of %i", $image['file'], filesize($image['file'])), 'DEBUG');
}
if (is_null($image_data) && getimagesize($image['file']) === false) {
$sql .= ' FROM ansel_faces WHERE image_id = ' . (int)$image_id
. ' ORDER BY face_id DESC';
- Horde::logMessage('SQL Query by Ansel_Faces::getImageFacesData: ' . $sql,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by Ansel_Faces::getImageFacesData: ' . $sql, 'DEBUG');
$result = $GLOBALS['ansel_db']->query($sql);
if ($result instanceof PEAR_Error) {
throw new Horde_Exception_Prior($result);
$haar = cv_object_load($this->_defs);
$seq = cv_haar_classifier_cascade_detect_objects($haar, $im);
$l = cv_seq_count($seq);
- Horde::logMessage(sprintf("opencv extension detected %u faces.", $l),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf("opencv extension detected %u faces.", $l), 'DEBUG');
$rects = array();
for ($i = 0; $i < $l; $i++) {
$r = cv_seq_get($seq, $i);
$gal_style = $GLOBALS['ansel_styles']['ansel_default'];
}
}
- Horde::logMessage(sprintf("using gallery style: %s in Ansel::getDefaultImage()", $gal_style['name']), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf("using gallery style: %s in Ansel::getDefaultImage()", $gal_style['name']), 'DEBUG');
if (!empty($gal_style['default_galleryimage_type']) &&
$gal_style['default_galleryimage_type'] != 'plain') {
} catch (Horde_Exception $e) {
// Might not support the requested style...try ansel_default
// but protect against infinite recursion.
- Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($e->getMessage(), 'DEBUG');
if ($style != 'ansel_default') {
return $this->getDefaultImage('ansel_default');
}
- Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e->getMessage(), 'ERR');
}
} else {
if (!is_null($parent) && !$parent->get('has_subgalleries')) {
return $parent->set('has_subgalleries', '1', true);
}
- Horde::logMessage('Ansel_Gallery parent successfully set', __FILE__,
- __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Ansel_Gallery parent successfully set', 'DEBUG');
/* Gallery parent changed, safe to change the parent's attributes */
if ($reset_has_subgalleries) {
array('ansel', $image->id));
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __LINE__, __FILE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return false;
}
}
$this->_gallery->data['attribute_images']) {
$images = $this->getImages(max(0, $from - $num_galleries), $to - count($galleries));
if (is_a($images, 'PEAR_Error')) {
- Horde::logMessage($images->message, __FILE__, __LINE__,
- PEAR_LOG_ERR);
+ Horde::logMessage($images, 'ERR');
$images = array();
}
} else {
array('ansel', $image->id));
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __LINE__, __FILE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return false;
}
}
try {
$data = $GLOBALS['ansel_vfs']->read($vfspath, $this->getVFSName($view));
} catch (VFS_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
throw new Ansel_Exception($e);
}
try {
$data = $GLOBALS['ansel_vfs']->read($this->getVFSPath('full'), $this->getVFSName('full'));
} catch (VFS_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
throw new Ansel_Exception($e);
}
if ($result instanceof PEAR_Error) {
// Since we got this far, the image has been added, so
// just log the tag failure.
- Horde::logMessage($result, __LINE__, __FILE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
}
}
$exif_fields = $exif->getData($imageFile);
} catch (Horde_Image_Exception $e) {
// Log the error, but it's not the end of the world, so just ignore
- Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
$exif_fields = array();
return false;
}
$this->load($view);
return $this->_image->toFile($this->_dirty ? false : $this->_data[$view]);
} catch (Horde_Exception $e) {
- Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
throw new Ansel_Exception($e);
}
}
try {
$this->_image->addEffect($type, $params);
} catch (Horde_Image_Exception $e) {
- Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
throw new Ansel_Exception($e);
}
}
// requested effect.
foreach ($view->need as $need) {
if (!Ansel::isAvailable($need)) {
- Horde::logMessage($err, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($err, 'ERR');
throw new Ansel_Exception(_("This install does not support the %s feature. Please contact your administrator."), $need);
}
}
return $view;
} else {
- Horde::logMessage($err, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($err, 'ERR');
throw new Ansel_Exception(sprintf(_("Unable to load the definition of %s."), $class));
}
}
$images[] = $img->getHordeImage();
$cnt--;
} catch (Exception $e) {
- Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
}
}
$aimg->load('screen');
$images[] = $aimg->getHordeImage();
} catch (Exception $e) {
- Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
}
}
/* Create the gallery */
$gallery = $this->_shares->newShare('');
if ($gallery instanceof PEAR_Error) {
- Horde::logMessage($gallery, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($gallery, 'ERR');
throw new Horde_Exception($gallery->getMessage());
}
- Horde::logMessage('New Ansel_Gallery object instantiated', __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('New Ansel_Gallery object instantiated', 'DEBUG');
/* Set the gallery's parent if needed */
if (!is_null($parent)) {
if ($result instanceof PEAR_Error) {
$error = sprintf(_("The gallery \"%s\" could not be created: %s"),
$attributes['name'], $result->getMessage());
- Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($error, 'ERR');
throw new Ansel_Exception($error);
}
. $this->_shares->_table . ' WHERE attribute_slug = ?');
if ($stmt instanceof PEAR_Error) {
- Horde::logMessage($stmt, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($stmt, 'ERR');
return 0;
}
$result = $stmt->execute($slug);
if ($result instanceof PEAR_Error) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return 0;
}
if (!$result->numRows()) {
$q = $this->_db->prepare('SELECT ' . $this->_getImageFields() . ' FROM ansel_images WHERE image_id = ?');
if ($q instanceof PEAR_Error) {
- Horde::logMessage($q, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($q, 'ERR');
throw new Ansel_Exception($q);
}
$result = $q->execute((int)$id);
if ($result instanceof PEAR_Error) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
throw new Ansel_Exception($result);
}
$image = $result->fetchRow(MDB2_FETCHMODE_ASSOC);
if (is_null($image)) {
throw new Horde_Exception_NotFound(_("Photo not found"));
} elseif ($image instanceof PEAR_Error) {
- Horde::logMessage($image, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($image, 'ERR');
throw new Ansel_Exception($image);
} else {
$image['image_filename'] = Horde_String::convertCharset($image['image_filename'], $GLOBALS['conf']['sql']['charset']);
if ($image->id) {
$update = $this->_db->prepare('UPDATE ansel_images SET image_filename = ?, image_type = ?, image_caption = ?, image_sort = ?, image_original_date = ?, image_latitude = ?, image_longitude = ?, image_location = ?, image_geotag_date = ? WHERE image_id = ?');
if (is_a($update, 'PEAR_Error')) {
- Horde::logMessage($update, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($update, 'ERR');
throw new Ansel_Exception($update);
}
$result = $update->execute(array(Horde_String::convertCharset($image->filename, Horde_Nls::getCharset(), $GLOBALS['conf']['sql']['charset']),
$image->geotag_timestamp,
$image->id));
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($update, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($update, 'ERR');
throw new Ansel_Exception($result);
}
$update->free();
/* Prepare the SQL statement */
$insert = $this->_db->prepare('INSERT INTO ansel_images (image_id, gallery_id, image_filename, image_type, image_caption, image_uploaded_date, image_sort, image_original_date, image_latitude, image_longitude, image_location, image_geotag_date) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)');
if (is_a($insert, 'PEAR_Error')) {
- Horde::logMessage($insert, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($insert, 'ERR');
throw new Ansel_Exception($insert);
}
(empty($image->lat) ? 0 : $image->uploaded)));
$insert->free();
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
throw new Ansel_Exception($result);
}
}
$this->_db->setLimit($count, $from);
$sql = 'SELECT ' . $fields . ' FROM ansel_images ' . $query_where . ' ORDER BY ' . $sort;
- Horde::logMessage('Query by Ansel_Storage::listImages: ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Query by Ansel_Storage::listImages: ' . $sql, 'DEBUG');
$results = $this->_db->query($sql);
if ($results instanceof PEAR_Error) {
throw new Ansel_Exception($results);
if (strlen($search)) {
$sql .= ' AND image_location LIKE "' . $search . '%"';
}
- Horde::logMessage(sprintf("SQL QUERY BY Ansel_Storage::searchLocations: %s", $sql), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf("SQL QUERY BY Ansel_Storage::searchLocations: %s", $sql), 'DEBUG');
$results = $this->_db->query($sql);
if ($results instanceof PEAR_Error) {
throw new Ansel_Exception($results);
$delete = $GLOBALS['ansel_db']->prepare('DELETE FROM ansel_galleries_tags WHERE gallery_id = ?');
$query = $GLOBALS['ansel_db']->prepare('INSERT INTO ansel_galleries_tags (gallery_id, tag_id) VALUES(?, ?)');
}
- Horde::logMessage('SQL query by Ansel_Tags::writeTags: ' . $query->query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL query by Ansel_Tags::writeTags: ' . $query->query, 'DEBUG');
$delete->execute(array($resource_id));
foreach ($tagkeys as $key) {
$query->execute(array($resource_id, $key));
if (is_a($stmt, 'PEAR_Error')) {
return $stmt;
}
- Horde::logMessage('SQL query by Ansel_Tags::readTags ' . $stmt->query, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL query by Ansel_Tags::readTags ' . $stmt->query, 'DEBUG');
$result = $stmt->execute((int)$resource_id);
$tags = $result->fetchAll(MDB2_FETCHMODE_ASSOC, true);
foreach ($tags as $id => $tag) {
. 'WHERE tag_id IN (' . implode(',', $ids) . ') GROUP BY '
. 'image_id HAVING count(tag_id) = ' . count($ids);
- Horde::logMessage('SQL query by Ansel_Tags::searchTags: ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL query by Ansel_Tags::searchTags: ' . $sql, 'DEBUG');
$GLOBALS['ansel_db']->setLimit($max, $from);
$images = $GLOBALS['ansel_db']->queryCol($sql);
if (is_a($images, 'PEAR_Error')) {
- Horde::logMessage($images, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($images, 'ERR');
$results['images'] = array();
} else {
/* Check permissions and filter on $user if required */
$imgs[] = $id;
}
} else {
- Horde::logMessage($gal, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($gal, 'ERR');
}
}
$results['images'] = $imgs;
. 'WHERE tag_id IN (' . implode(',', $ids) . ') GROUP BY '
. 'gallery_id HAVING count(tag_id) = ' . count($ids);
- Horde::logMessage('SQL query by Ansel_Tags::searchTags: ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL query by Ansel_Tags::searchTags: ' . $sql, 'DEBUG');
$GLOBALS['ansel_db']->setLimit($max, $from);
$galleries = $GLOBALS['ansel_db']->queryCol($sql);
if (is_a($galleries, 'PEAR_Error')) {
- Horde::logMessage($galleries, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($galleries, 'ERR');
} else {
/* Check perms */
foreach ($galleries as $id) {
$gallery = $GLOBALS['ansel_storage']->getGallery($id);
if (is_a($gallery, 'PEAR_Error')) {
- Horde::logMessage($gallery, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($gallery, 'ERR');
continue;
}
if ($gallery->hasPermission(Horde_Auth::getAuth(), Horde_Perms::SHOW) && (!isset($user) || (isset($user) && $gallery->get('owner') && $gallery->get('owner') == $user))) {
$gallery = $this->_getGallery($identifier);
}
} catch (Horde_Exception $e) {
- Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
exit;
}
if (!$gallery->hasPermission(Horde_Auth::getAuth(), Horde_Perms::READ)) {
try {
$this->gallery = $this->_getGallery($gallery_id, $gallery_slug);
} catch (Horde_Exception $e) {
- Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
exit;
}
public function __construct($params = array())
{
parent::__construct($params);
-
+
/* Get the Ansel_Image */
$image = &$GLOBALS['ansel_storage']->getImage($params['image_id']);
try {
$this->_geometry = $this->resource->getDimensions('screen');
} catch (Horde_Exception $e) {
- Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
$this->_geometry = $conf['screen'];
}
'commentCallback', true, null,
$url));
if (is_a($comments, 'PEAR_Error')) {
- Horde::logMessage($comments, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($comments, 'DEBUG');
$comments = array();
}
} else {
null, true, 0, 0,
'name', 0);
} catch (Ansel_Exception $e) {
- Horde::logMessage($gal, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($gal, 'ERR');
return '';
}
$groupList = $groups->listGroups();
asort($groupList);
if (is_a($groupList, 'PEAR_Error')) {
- Horde::logMessage($groupList, __FILE__, __LINE__, PEAR_LOG_NOTICE);
+ Horde::logMessage($groupList, 'NOTICE');
$groupList = array();
}
$imageId = Horde_Util::getFormData('image');
$image = &$ansel_storage->getImage($imageId);
if (is_a($image, 'PEAR_Error')) {
- Horde::logMessage($image, __LINE__, __FILE__, PEAR_LOG_ERR);
+ Horde::logMessage($image, 'ERR');
exit;
}
$gal = $ansel_storage->getGallery(abs($image->gallery));
if (is_a($gal, 'PEAR_Error')) {
- Horde::logMessage($image, __LINE__, __FILE__, PEAR_LOG_ERR);
+ Horde::logMessage($image, 'ERR');
exit;
}
$img = Ansel::getImageUrl($imageId, 'thumb', false);
if (is_a($ret, 'PEAR_Error')) {
$error = _("Couldn't read command-line options.");
- Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($error, 'DEBUG');
$cli->fatal($error);
}
$auth = Horde_Auth::singleton($conf['auth']['driver']);
if (!$auth->authenticate($username, array('password' => $password))) {
$error = _("Login is incorrect.");
- Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($error, 'ERR');
$cli->fatal($error);
} else {
$msg = sprintf(_("Logged in successfully as \"%s\"."), $username);
- Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($msg, 'DEBUG');
$cli->message($msg, 'cli.success');
}
}
if (!empty($galleryId)) {
if (!$ansel_storage->galleryExists($galleryId)) {
$error = sprintf(_("Invalid gallery \"%s\" specified."), $galleryId);
- Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_WARNING);
+ Horde::logMessage($error, 'WARN');
$cli->fatal($error);
} else {
$gallery = $ansel_storage->getGallery($galleryId);
!$gallery->hasPermission(Horde_Auth::getAuth(), Horde_Perms::EDIT)) {
$error = sprintf(_("Access denied adding photos to \"%s\"."),
$galleryId);
- Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_WARNING);
+ Horde::logMessage($error, 'WARN');
$cli->fatal($error);
}
}
$galleryId = null;
$error = sprintf(_("The gallery \"%s\" couldn't be created: %s"),
$gallery_name, $gallery->getMessage());
- Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($error, 'ERR');
$cli->fatal($error);
} else {
$msg = sprintf(_("The gallery \"%s\" was created successfully."),
$gallery_name);
- Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($msg, 'DEBUG');
$cli->message($msg, 'cli.success');
}
}
$galleries = $GLOBALS['ansel_storage']->listGalleries();
if (is_a($galleries, 'PEAR_Error')) {
$error = _("Couldn't list galleries.");
- Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($error, 'DEBUG');
$cli->fatal($error);
}
$name = $gallery->get('name');
$msg = "$id/$name";
$cli->writeln($msg);
- Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($msg, 'DEBUG');
}
}
}
if (!empty($file) && isset($gallery) && !is_a($gallery, 'PEAR_Error')) {
$image = &Ansel::getImageFromFile($file, array('caption' => $caption));
if (is_a($image, 'PEAR_Error')) {
- Horde::logMessage($image->getMessage(), __FILE__, __LINE__, PEAR_LOG_WARNING);
+ Horde::logMessage($image, 'WARN');
$cli->fatal($image->getMessage());
}
if (is_a($image_id, 'PEAR_Error')) {
$error = sprintf(_("There was a problem adding the photo \"%s\" to gallery \"%s\": %s"),
basename($file), $galleryId, $image_id->getMessage());
- Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($error, 'ERR');
$cli->fatal($error);
}
$msg = sprintf(_("Successfully added photo \"%s\" to gallery \"%s\"."),
basename($file), $galleryId);
$cli->message($msg, 'cli.success');
- Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_NOTICE);
+ Horde::logMessage($msg, 'NOTICE');
}
// Add all images from a directory on the filesystem.
if (!empty($dir) && isset($gallery) && !is_a($gallery, 'PEAR_Error')) {
$msg = addDirToGallery($dir, $gallery);
if (is_a($msg, 'PEAR_Error')) {
- Horde::logMessage($msg->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($msg, 'ERR');
$cli->fatal($msg->getMessage());
}
if ($msg) {
$msg = sprintf(ngettext("Successfully added %d photo (%s) to gallery \"%s\" from \"%s\".", "Successfully added %d photos (%s) to gallery \"%s\" from \"%s\".", count($msg)),
count($msg), join(', ', $msg), $galleryId, $dir);
$cli->message($msg, 'cli.success');
- Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_NOTICE);
+ Horde::logMessage($msg, 'NOTICE');
} else {
$msg = sprintf(_("The directory \"%s\" had no valid photos."), $dir);
$cli->message($msg, 'cli.warning');
- Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_WARNING);
+ Horde::logMessage($msg, 'WARN');
}
}
if (!file_exists($dir)) {
$error = sprintf(_("The directory \"%s\" doesn't exist."), $dir);
- Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($error, 'ERR');
return PEAR::raiseError($error);
}
if (!$files_array) {
$error = sprintf(_("The directory \"%s\" is empty."), $dir);
- Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($error, 'ERR');
return PEAR::raiseError($error);
}
chdir($dir);
foreach ($files_array as $file) {
$image = Ansel::getImageFromFile($dir . '/' . $file);
if (is_a($image, 'PEAR_Error')) {
- Horde::logMessage($image->getMessage(), __FILE__, __LINE__, PEAR_LOG_WARNING);
+ Horde::logMessage($image, 'WARN');
$cli->message($image->getMessage(), 'cli.error');
continue;
}
if (is_a($image_id, 'PEAR_Error')) {
$error = sprintf(_("There was a problem adding the photo \"%s\" to gallery \"%s\"."),
$file, $galleryId);
- Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($error, 'ERR');
$cli->message($image_id->getMessage(), 'cli.error');
continue;
}
'desc' => $gallery_desc));
if (is_a($gallery, 'PEAR_Error')) {
$error = sprintf(_("The gallery \"%s\" couldn't be created: %s"), $gallery_name, $gallery->getMessage());
- Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($error, 'ERR');
} else {
$galleryId = $gallery->id;
$msg = sprintf(_("The gallery \"%s\" was created successfully."), $gallery_name);
- Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($msg, 'DEBUG');
}
} else {
if (empty($galleryId) && $prefs->getValue('autoname')) {
'r.ttl AS ttl FROM ' . $this->_params['domains_table'] .
' AS d JOIN ' . $this->_params['records_table'] . ' AS r ON ' .
'r.domain_id = d.id WHERE r.type = \'SOA\'';
- Horde::logMessage('SQL Query by Beatnik_Driver_pdnsgsql::_getDomains(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by Beatnik_Driver_pdnsgsql::_getDomains(): ' . $query, 'DEBUG');
$domainlist = $this->_db->getAll($query, null, DB_FETCHMODE_ASSOC);
if (is_a($domainlist, 'PEAR_Error')) {
- Horde::logMessage($domainlist, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($domainlist, 'ERR');
throw new Beatnik_Exception(_("Error getting domain list. Details have been logged for the administrator."));
}
foreach ($domainlist as $info) {
$soa = explode(' ', $info['content']);
if (count($soa) != 7) {
- Horde::logMessage(sprintf('Invalid SOA found for %s, skipping.', $info['name']), __FILE__, __LINE__, PEAR_LOG_WARNING);
+ Horde::logMessage(sprintf('Invalid SOA found for %s, skipping.', $info['name']), 'WARN');
continue;
}
' AS d JOIN ' . $this->_params['records_table'] . ' AS r ON ' .
'r.domain_id = d.id WHERE r.type = \'SOA\' AND d.name = ?';
$values = array($domainname);
- Horde::logMessage('SQL Query by Beatnik_Driver_pdnsgsql::getDomain(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by Beatnik_Driver_pdnsgsql::getDomain(): ' . $query, 'DEBUG');
$result = $this->_db->getAll($query, $values, DB_FETCHMODE_ASSOC);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
throw new Beatnik_Exception(_("An error occurred while searching the database. Details have been logged for the administrator."), __FILE__, __LINE__, PEAR_LOG_ERR);
}
$soa = explode(' ', $info['content']);
if (count($soa) != 7) {
- Horde::logMessage(sprintf('Invalid SOA found for %s, skipping.', $info['name']), __FILE__, __LINE__, PEAR_LOG_WARN);
+ Horde::logMessage(sprintf('Invalid SOA found for %s, skipping.', $info['name']), 'WARN');
throw new Beatnik_Exception(_("Corrupt SOA found for zone. Contact your administrator."), __FILE__, __LINE__, PEAR_LOG_ERR);
}
'd.id = r.domain_id AND d.name = ?';
$values = array($domain);
- Horde::logMessage('SQL Query by Beatnik_Driver_pdnsgsql::getRecords(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by Beatnik_Driver_pdnsgsql::getRecords(): ' . $query, 'DEBUG')
$result = $this->_db->getAll($query, $values, DB_FETCHMODE_ASSOC);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
throw new Beatnik_Exception(_("An error occurred while searching the database. Details have been logged for the administrator."), __FILE__, __LINE__, PEAR_LOG_ERR);
}
case 'soa':
$soa = explode(' ', $rec['content']);
if (count($soa) != 7) {
- Horde::logMessage(sprintf('Invalid SOA found for %s, skipping.', $info['name']), __FILE__, __LINE__, PEAR_LOG_WARNING);
+ Horde::logMessage(sprintf('Invalid SOA found for %s, skipping.', $info['name']), 'WARN');
}
-
+
$tmp['zonename'] = $rec['name'];
$tmp['zonens'] = $soa[0];
$tmp['zonecontact'] = $soa[1];
case 'srv':
$srv = preg_split('/\s+/', trim($rec['content']));
if (count($srv) != 3) {
- Horde::logMessage(sprintf('Invalid SRV data found for %s, skipping.', $rec['name']), __FILE__, __LINE__, PEAR_LOG_WARNING);
+ Horde::logMessage(sprintf('Invalid SRV data found for %s, skipping.', $rec['name']), 'WARN');
continue;
}
$tmp['hostname'] = $rec['name'];
}
if (!empty($info['id'])) {
- $query = 'UPDATE ' . $this->_params['records_table'] . ' SET ' .
+ $query = 'UPDATE ' . $this->_params['records_table'] . ' SET ' .
'name = ?, type = ?, content = ?, ttl = ?, ' .
'prio = ' . (empty($prio) ? 'NULL' : $prio) . ', ' .
'change_date = ? WHERE id = ?';
$values[] = $info['id'];
} else {
$query = 'INSERT INTO ' . $this->_params['records_table'] . ' ' .
- '(domain_id, name, type, content, ttl, prio, ' .
+ '(domain_id, name, type, content, ttl, prio, ' .
'change_date) VALUES (?, ?, ?, ?, ?, ' .
(empty($prio) ? 'NULL' : '?') . ', ?)';
$values = array($domain_id, $name, $type, $content, $ttl);
$values[] = $change_date;
}
- Horde::logMessage('SQL Query by Beatnik_Driver_pdnsgsql::_saveRecord(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by Beatnik_Driver_pdnsgsql::_saveRecord(): ' . $query, 'DEBUG');
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
return $result;
'PowerDNS Generic SQL',
array('driver' => 'pdnsgsql'));
} catch (Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
throw $e;
}
array('help', 'username=', 'password=', 'type=', 'rpc='));
} catch (Exception $e) {
$error = _("Couldn't read command-line options.");
- Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($error, 'DEBUG');
$cli->fatal($error);
}
case '--password':
$password = $optValue;
break;
-
+
case 't':
case '--type':
$type = $optValue;
break;
-
+
case 'r':
case '--rpc':
$rpc = $optValue;
} catch (Exception $e) {
$cli->fatal($e);
}
-
+
// Login to horde if username & password are set and load module.
} elseif (!empty($username) && !empty($password)) {
$auth = &Horde_Auth::singleton($conf['auth']['driver']);
if (!$auth->authenticate($username, array('password' => $password))) {
$error = _("Login is incorrect.");
- Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($error, 'ERR');
$cli->fatal($error);
} else {
$msg = sprintf(_("Logged in successfully as \"%s\"."), $username);
- Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($msg, 'DEBUG');
$cli->message($msg, 'cli.success');
}
require_once BEATNIK_BASE . '/lib/base.php';
-
+
} else {
$msg = _("Have noting to do.");
$cli->fatal($msg);
$GLOBALS['cli']->fatal($e);
}
}
-
+
return $result;
}
$c .= "$pointer $hostname.$domain.$tld\n";
}
}
-
+
return $c;
}
// use empty hostname as alias for www
$c .= "ln -s /var/www/$zonename" . "_$tld/$zonename.$tld " .
"/var/www/$zonename" . "_$tld/$hostname.$zonename.$tld" . "\n";
- continue;
+ continue;
}
$c .= "mkdir /var/www/$zonename" . "_$tld/$hostname.$zonename.$tld" . "\n";
$c .= "mkdir /var/log/apache2/$hostname.$zonename.$tld" . "\n";
}
}
-
+
return $c;
}
$c .= "</VirtualHost>\n";
}
}
-
+
return $c;
}
$c .= "\n";
}
-
+
return $c;
}
$addform = new Horde_Form_AddClient($vars);
if (is_a($addform, 'PEAR_Error')) {
- Horde::logMessage($addform, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($addform, 'ERR');
$notification->push(_("An internal error has occurred. Details have been logged for the administrator."));
$addform = null;
}
$query = 'SELECT * FROM ' . $this->_params['table'];
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Crumb_Driver_sql::_listClients(): %s', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Crumb_Driver_sql::_listClients(): %s', $query), 'DEBUG');
/* Execute the query. */
$result = $this->_db->getAll($query, array(), DB_FETCHMODE_ASSOC);
try {
$turbaform = $GLOBALS['registry']->call('contacts/getAddClientForm', array(&$vars));
} catch (Horde_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
$notification->push(_("An internal error has occurred. Details have beenlogged for the administrator."));
$addform = null;
}
try {
$whupsform = $GLOBALS['registry']->call('tickets/getAddQueueForm', array(&$vars));
} catch (Horde_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
$notification->push(_("An internal error has occurred. Details have been logged for the administrator."));
$addform = null;
}
$query .= ' ORDER BY account_number ASC';
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Fima_Driver_sql::retrieveAccounts(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Fima_Driver_sql::retrieveAccounts(): %s', $query), 'DEBUG');
/* Execute the query. */
$this->_accounts = array();
$values = array($this->_ledger, $accountId);
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Fima_Driver_sql::getAccount(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Fima_Driver_sql::getAccount(): %s', $query), 'DEBUG');
/* Execute the query. */
$result = $this->_db->query($query, $values);
$values = array($this->_ledger, sprintf('%\'04s', $number));
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Fima_Driver_sql::getAccountByNumber(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Fima_Driver_sql::getAccountByNumber(): %s', $query), 'DEBUG');
/* Execute the query. */
$result = $this->_db->query($query, $values);
$query .= $queryfilter;
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Fima_Driver_sql::retrievePostings(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Fima_Driver_sql::retrievePostings(): %s', $query), 'DEBUG');
/* Execute the query. */
$result = $this->_db->query($query, $values);
// correct result when account is an asset account too
if ($this->_postingsCount > 0) {
$query = sprintf('SELECT SUM(p.posting_amount) posting_result ' .
- 'FROM %s p JOIN %s a ON a.account_id = p.posting_account ' .
+ 'FROM %s p JOIN %s a ON a.account_id = p.posting_account ' .
$queryfilter . ' AND a.account_type = ?',
$this->_params['table_postings'], $this->_params['table_accounts']);
$values2 = $values;
$sorting = array('posting_date ASC');
}
$query .= ' ORDER BY ' . implode(', ', $sorting);
-
+
/* Limit. */
if (count($limit) > 0) {
if ($limit[0] < 0) {
$limit[0] += ceil($this->_postingsCount / $limit[1]) + 1;
}
$limit[0] = ($limit[0] - 1) * $limit[1];
-
+
$query .= ' LIMIT ' . $limit[0];
if (isset($limit[1])) {
$query .= ', ' . $limit[1];
}
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Fima_Driver_sql::retrievePostings(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Fima_Driver_sql::retrievePostings(): %s', $query), 'DEBUG');
/* Execute the query. */
$result = $this->_db->query($query, $values);
} else {
return $result;
}
-
+
return true;
}
$values = array($this->_ledger, $postingId);
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Fima_Driver_sql::getPosting(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Fima_Driver_sql::getPosting(): %s', $query), 'DEBUG');
/* Execute the query. */
$result = $this->_db->query($query, $values);
*/
function getResults($groups, $filters = array()) {
$matrix = array();
-
+
/* Fix grouping. */
if (!is_array($groups)) {
$groups = array($groups);
default: $groups[$groupId] = 'posting_'.$group; break;
}
}
-
+
/* Build the SQL query filter. */
$query = sprintf('SELECT %s x, %s y, sum(posting_amount) result ' .
'FROM %s p LEFT OUTER JOIN %s asset ON p.posting_asset = asset.account_id AND p.posting_owner = asset.account_owner LEFT OUTER JOIN %s account ON p.posting_account = account.account_id AND p.posting_owner = account.account_owner ' .
}
}
$this->_addFilters($filters, $query, $values);
-
+
/* Add grouping. */
$query .= ' GROUP BY ' . implode(', ', $groups);
-
+
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Fima_Driver_sql::getResults(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Fima_Driver_sql::getResults(): %s', $query), 'DEBUG');
/* Execute the query. */
$result = $this->_db->query($query, $values);
}
$result->free();
}
-
+
return $matrix;
}
function getAssetResults($postingtype, $perdate = null)
{
$perdate = ($perdate === null) ? mktime() : (int)$perdate;
-
+
/* Build the SQL query. */
$query = sprintf('SELECT account_id, SUM(account_result) account_result FROM ( ' .
' SELECT a1.account_id, SUM(p1.posting_amount) account_result ' .
$this->_ledger, $postingtype, $this->_ledger, FIMA_ACCOUNTTYPE_ASSET, $perdate);
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Fima_Driver_sql::getAssetResults(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Fima_Driver_sql::getAssetResults(): %s', $query), 'DEBUG');
/* Execute the query. */
$assetresults = array();
}
}
}
-
+
/* Create a new account based on $row's values. */
return array('account_id' => $row['account_id'],
'owner' => $row['account_owner'],
'desc' => Horde_String::convertCharset($row['account_desc'], $this->_params['charset']),
'closed' => $row['account_closed'],
'label' => trim($row['account_number'] . ' ' .
- (($parent === null) ? '' : $parent['name'] . ' - ') .
+ (($parent === null) ? '' : $parent['name'] . ' - ') .
Horde_String::convertCharset($row['account_name'], $this->_params['charset'])),
'parent_id' => ($parent === null) ? null : $parent['account_id'],
'parent_number' => ($parent === null) ? '' : $parent['number'],
'parent_name' => ($parent === null) ? '' : $parent['name']);
}
-
+
/**
* Adds an account to the backend storage.
*
(int)(bool)$closed);
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Fima_Driver_sql::_addAccount(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Fima_Driver_sql::_addAccount(): %s', $query), 'DEBUG');
/* Attempt the insertion query. */
$result = $this->_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$accountId);
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Fima_Driver_sql::_modifyAccount(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Fima_Driver_sql::_modifyAccount(): %s', $query), 'DEBUG');
/* Attempt the update query. */
$result = $this->_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
return true;
}
-
+
/**
* Deletes an account from the backend.
*
return $delete;
}
}
- }
+ }
/* Handle postings. */
if ($dsPostings !== false) {
$query = sprintf('DELETE FROM %s WHERE posting_owner = ? AND (posting_asset = ? OR posting_account = ?)',
$this->_params['table_postings']);
$values = array($this->_ledger, $accountId, $accountId);
-
+
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Fima_Driver_sql::_deleteAccount(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Fima_Driver_sql::_deleteAccount(): %s', $query), 'DEBUG');
/* Attempt the delete query. */
$result = $this->_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
} else {
$values = array($this->_ledger, $accountId);
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Fima_Driver_sql::_deleteAccount(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Fima_Driver_sql::_deleteAccount(): %s', $query), 'DEBUG');
/* Attempt the delete query. */
$result = $this->_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
'amount' => $row['posting_amount'],
'eo' => (int)(bool)$row['posting_eo']);
}
-
+
/**
* Adds a posting to the backend storage.
*
Horde_String::convertCharset($desc, Horde_Nls::getCharset(), $this->_params['charset']));
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Fima_Driver_sql::_addPosting(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Fima_Driver_sql::_addPosting(): %s', $query), 'DEBUG');
/* Attempt the insertion query. */
$result = $this->_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$postingId);
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Fima_Driver_sql::_modifyPosting(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Fima_Driver_sql::_modifyPosting(): %s', $query), 'DEBUG');
/* Attempt the update query. */
$result = $this->_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
return true;
}
-
+
/**
* Deletes a posting from the backend.
*
$values = array($this->_ledger, $postingId);
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Fima_Driver_sql::_deletePosting(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Fima_Driver_sql::_deletePosting(): %s', $query), 'DEBUG');
/* Attempt the delete query. */
$result = $this->_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$values[] = $postingId;
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Fima_Driver_sql::_shiftPosting(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Fima_Driver_sql::_shiftPosting(): %s', $query), 'DEBUG');
/* Attempt the update query. */
$result = $this->_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
return true;
}
-
+
/**
* Shift postings in the backend.
*
if (!is_array($accountIdFrom)) {
$accountIdFrom = array($accountIdFrom);
}
-
+
foreach ($accountIdFrom as $key => $value) {
$accountIdFrom[$key] = $this->_db->quoteSmart($value);
}
$values = array($accountIdTo, $this->_ledger, implode(',', $accountIdFrom));
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Fima_Driver_sql::_shiftPostings(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Fima_Driver_sql::_shiftPostings(): %s', $query), 'DEBUG');
/* Attempt the update query. */
$result = $this->_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
}
return true;
}
-
+
/**
* Deletes all postings and accounts.
*
$query = sprintf('DELETE FROM %s WHERE posting_owner = ?',
$this->_params['table_postings']);
$values = array($this->_ledger);
-
+
/* Filter. */
if ($postings !== true) {
$query .= ' AND posting_type = ?';
}
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Fima_Driver_sql::_deleteAll(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Fima_Driver_sql::_deleteAll(): %s', $query), 'DEBUG');
/* Attempt the delete query. */
$result = $this->_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
} else {
/* If postings aren't deleted, don't delete accounts. */
return false;
}
-
+
/* Delete Accounts */
if ($accounts) {
$query = sprintf('DELETE FROM %s WHERE account_owner = ?',
}
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Fima_Driver_sql::_deleteAll(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Fima_Driver_sql::_deleteAll(): %s', $query), 'DEBUG');
/* Attempt the delete query. */
$result = $this->_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
}
/**
* Build the where clause for a query using the passed filters
* Attention: does not include the WHERE keyword, add WHERE 1=1 manually in the query
- *
+ *
* @param array $filters Array of filters, syntax: array(field, value [, operator = '=' [, andor = 'AND']])
* @param array $prefix optional prefix for fields
*
function _addFilters($filters, &$query, &$values, $prefix = '')
{
$filtercnt = 0;
-
+
foreach ($filters as $filter) {
// and/or
if (!isset($filter[3])) {
$filter[3] = 'AND';
}
}
-
+
// subfilter
if (is_array($filter[0])) {
$query .= ' ' . $filter[3] . ' (1=1';
$query .= ')';
continue;
}
-
+
// fix operator
if (!isset($filter[2])) {
$filter[2] = '=';
$filter[2] = '=';
}
}
-
+
// fix operator for null values
if ($filter[1] === null) {
if (!in_array($filter[2], array('IS', 'IS NOT'))) {
} elseif (in_array($filter[2], array('IS', 'IS NOT'))) {
$filter[2] = ($filter[2] == 'IS') ? '=' : '!=';
}
-
+
// fix operator for array value + prepare values
if (is_array($filter[1])) {
if (!in_array($filter[2], array('IN', 'NOT IN'))) {
}
$filterph = '?';
}
-
+
// fix != operator
if ($filter[2] == '!=') {
$filter[2] = '<>';
}
-
+
$query .= sprintf(' ' . $filter[3] . ' ' . $prefix . '%s %s %s', $filter[0], $filter[2], $filterph);
$values[] = $filter[1];
$filtercnt++;
}
-
+
return $filtercnt;
}
{
$ledgers = $GLOBALS['fima_shares']->listShares(Horde_Auth::getAuth(), $permission, $owneronly ? Horde_Auth::getAuth() : null);
if (is_a($ledgers, 'PEAR_Error')) {
- Horde::logMessage($ledgers, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($ledgers, 'ERR');
return array();
}
if ($auth->hasCapability('list')) {
$userList = $auth->listUsers();
if (is_a($userList, 'PEAR_Error')) {
- Horde::logMessage($userList, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($userList, 'ERR');
$userList = array();
}
sort($userList);
$groupList = $groups->getGroupMemberships(Horde_Auth::getAuth(), true);
}
if (is_a($groupList, 'PEAR_Error')) {
- Horde::logMessage($groupList, __FILE__, __LINE__, PEAR_LOG_NOTICE);
+ Horde::logMessage($groupList, 'NOTICE');
$groupList = array();
}
asort($groupList);
if ($ret instanceof PEAR_Error) {
$error = _("Couldn't read command-line options.");
- Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($error, 'DEBUG');
$cli->fatal($error);
}
$auth = Horde_Auth::singleton($conf['auth']['driver']);
if (!$auth->authenticate($username, array('password' => $password))) {
$error = _("Login is incorrect.");
- Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($error, 'ERR');
$cli->fatal($error);
} else {
$msg = sprintf(_("Logged in successfully as \"%s\"."), $username);
- Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($msg, 'DEBUG');
$cli->message($msg, 'cli.success');
}
}
try {
$speller = Horde_SpellChecker::factory($GLOBALS['conf']['spell']['driver'], $spellArgs);
} catch (Horde_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
return array();
}
try {
return $speller->spellCheck(Horde_Util::getPost($args['input']));
} catch (Horde_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
return array('bad' => array(), 'suggestions' => array());
}
}
try {
$app_alarms = $GLOBALS['registry']->callByPackage($app, 'listAlarms', array(time(), $user), array('noperms' => true));
} catch (Horde_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
$app_alarms = array();
}
$alarms = array_merge($alarms, $app_alarms);
try {
$alarms = $this->listAlarms($user, null, $load, $preload);
} catch (Horde_Alarm_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
throw $e;
}
try {
$this->{'_' . $alarm_method}($alarm);
} catch (Horde_Alarm_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
}
}
}
$query = sprintf('SELECT alarm_id, alarm_uid, alarm_start, alarm_end, alarm_methods, alarm_params, alarm_title, alarm_text, alarm_snooze, alarm_internal FROM %s WHERE alarm_id = ? AND %s',
$this->_params['table'],
!empty($user) ? 'alarm_uid = ?' : '(alarm_uid = ? OR alarm_uid IS NULL)');
- Horde::logMessage('SQL query by Horde_Alarm_sql::_get(): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL query by Horde_Alarm_sql::_get(): ' . $query, 'DEBUG');
$alarm = $this->_db->getRow($query, array($id, $user), DB_FETCHMODE_ASSOC);
if ($alarm instanceof PEAR_Error) {
Horde::logMessage($alarm, __FILE__, __LINE__);
$values[] = '';
$values[] = (string)$user;
}
- Horde::logMessage('SQL query by Horde_Alarm_sql::_list(): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL query by Horde_Alarm_sql::_list(): ' . $query, 'DEBUG');
$alarms = array();
$result = $this->_db->query($query, $values);
empty($alarm['text']) ? null : $this->_toDriver($alarm['text']),
null
);
- Horde::logMessage('SQL query by Horde_Alarm_sql::_add(): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL query by Horde_Alarm_sql::_add(): ' . $query, 'DEBUG');
$result = $this->_write_db->query($query, $values);
if ($result instanceof PEAR_Error) {
: $this->_toDriver($alarm['text']),
$alarm['id'],
isset($alarm['user']) ? $alarm['user'] : '');
- Horde::logMessage('SQL query by Horde_Alarm_sql::_update(): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL query by Horde_Alarm_sql::_update(): ' . $query, 'DEBUG');
$result = $this->_write_db->query($query, $values);
if ($result instanceof PEAR_Error) {
$this->_params['table'],
!empty($user) ? 'alarm_uid = ?' : '(alarm_uid = ? OR alarm_uid IS NULL)');
$values = array(serialize($internal), $id, $user);
- Horde::logMessage('SQL query by Horde_Alarm_sql::_internal(): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL query by Horde_Alarm_sql::_internal(): ' . $query, 'DEBUG');
$result = $this->_write_db->query($query, $values);
if ($result instanceof PEAR_Error) {
$query = sprintf('SELECT 1 FROM %s WHERE alarm_id = ? AND %s',
$this->_params['table'],
!empty($user) ? 'alarm_uid = ?' : '(alarm_uid = ? OR alarm_uid IS NULL)');
- Horde::logMessage('SQL query by Horde_Alarm_sql::_exists(): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL query by Horde_Alarm_sql::_exists(): ' . $query, 'DEBUG');
$result = $this->_db->getOne($query, array($id, $user));
if ($result instanceof PEAR_Error) {
$this->_params['table'],
!empty($user) ? 'alarm_uid = ?' : '(alarm_uid = ? OR alarm_uid IS NULL)');
$values = array((string)$snooze->setTimezone('UTC'), $id, $user);
- Horde::logMessage('SQL query by Horde_Alarm_sql::_snooze(): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL query by Horde_Alarm_sql::_snooze(): ' . $query, 'DEBUG');
$result = $this->_write_db->query($query, $values);
if ($result instanceof PEAR_Error) {
$this->_params['table'],
!empty($user) ? 'alarm_uid = ?' : '(alarm_uid = ? OR alarm_uid IS NULL)');
$values = array($id, $user);
- Horde::logMessage('SQL query by Horde_Alarm_sql::_dismiss(): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL query by Horde_Alarm_sql::_dismiss(): ' . $query, 'DEBUG');
$result = $this->_write_db->query($query, $values);
if ($result instanceof PEAR_Error) {
$query = sprintf('SELECT 1 FROM %s WHERE alarm_id = ? AND %s AND (alarm_dismissed = 1 OR (alarm_snooze IS NOT NULL AND alarm_snooze >= ?))',
$this->_params['table'],
!empty($user) ? 'alarm_uid = ?' : '(alarm_uid = ? OR alarm_uid IS NULL)');
- Horde::logMessage('SQL query by Horde_Alarm_sql::_isSnoozed(): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL query by Horde_Alarm_sql::_isSnoozed(): ' . $query, 'DEBUG');
$result = $this->_db->getOne($query, array($id, $user, (string)$time->setTimezone('UTC')));
if ($result instanceof PEAR_Error) {
: ' AND alarm_uid = ?';
$values[] = $user;
}
- Horde::logMessage('SQL query by Horde_Alarm_sql::_delete(): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL query by Horde_Alarm_sql::_delete(): ' . $query, 'DEBUG');
$result = $this->_write_db->query($query, $values);
if ($result instanceof PEAR_Error) {
protected function _gc()
{
$query = sprintf('DELETE FROM %s WHERE alarm_end IS NOT NULL AND alarm_end < ?', $this->_params['table']);
- Horde::logMessage('SQL query by Horde_Alarm_sql::_gc(): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL query by Horde_Alarm_sql::_gc(): ' . $query, 'DEBUG');
$end = new Horde_Date(time());
$result = $this->_write_db->query($query, (string)$end->setTimezone('UTC'));
$query = "ALTER SESSION SET NLS_DATE_FORMAT = 'YYYY-MM-DD HH24:MI:SS'";
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('SQL connection setup for Alarms, query = "%s"', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('SQL connection setup for Alarms, query = "%s"', $query), 'DEBUG');
$db->query($query);
break;
$query = "SET datestyle TO 'iso'";
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('SQL connection setup for Alarms, query = "%s"', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('SQL connection setup for Alarms, query = "%s"', $query), 'DEBUG');
$db->query($query);
break;
'charset' => 'iso-8859-1');
require_once 'Log.php';
-$conf['log'] = array('priority' => PEAR_LOG_DEBUG,
+$conf['log'] = array('priority' => 'DEBUG',
'ident' => 'HORDE',
'params' => array('append' => true),
'name' => '/tmp/horde.log',
try {
$GLOBALS['registry']->callByPackage($app, 'removeUserData', array($userId));
} catch (Horde_Auth_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
$errApps[] = $app;
}
}
$query = str_replace('\L', $this->_db->quote($userId), $query);
$pw = $this->_db->getOne($query);
if ($pw instanceof PEAR_Error) {
- Horde::logMessage($pw, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($pw, __FILE__, __LINE__, 'ERR');
return '';
}
try {
$this->_connect();
} catch (Horde_Auth_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
throw new Horde_Auth_Exception('', Horde_Auth::REASON_FAILED);
}
$values = array($userId);
}
- Horde::logMessage('SQL Query by Horde_Auth_Cyrsql::_authenticate(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by Horde_Auth_Cyrsql::_authenticate(): ' . $query, 'DEBUG');
$result = $this->_db->query($query, $values);
if ($result instanceof PEAR_Error) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
throw new Horde_Auth_Exception('', Horde_Auth::REASON_FAILED);
}
$this->_params['encryption'],
$this->_params['show_encryption']));
- Horde::logMessage('SQL Query by Horde_Auth_Cyrsql::addUser(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by Horde_Auth_Cyrsql::addUser(): ' . $query, 'DEBUG');
$dbresult = $this->_db->query($query, $values);
$query = 'INSERT INTO virtual (alias, dest, username, status) VALUES (?, ?, ?, 1)';
$values = array($userId, $userId, $name);
- Horde::logMessage('SQL Query by Horde_Auth_Cyrsql::addUser(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by Horde_Auth_Cyrsql::addUser(): ' . $query, 'DEBUG');
$dbresult2 = $this->_db->query($query, $values);
if ($dbresult2 instanceof PEAR_Error) {
$this->_params['domain_field']);
$values = array($name, $domain);
- Horde::logMessage('SQL Query by Horde_Auth_Cyrsql::removeUser(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by Horde_Auth_Cyrsql::removeUser(): ' . $query, 'DEBUG');
$dbresult = $this->_db->query($query, $values);
$query = 'DELETE FROM virtual WHERE dest = ?';
$values = array($userId);
- Horde::logMessage('SQL Query by Horde_Auth_Cyrsql::removeUser(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by Horde_Auth_Cyrsql::removeUser(): ' . $query, 'DEBUG');
$dbresult2 = $this->_db->query($query, $values);
if ($dbresult2 instanceof PEAR_Error) {
$this->_params['username_field']);
}
- Horde::logMessage('SQL Query by Horde_Auth_Cyrsql::listUsers(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by Horde_Auth_Cyrsql::listUsers(): ' . $query, 'DEBUG');
$result = $this->_db->getAll($query, null, DB_FETCHMODE_ORDERED);
if ($result instanceof PEAR_Error) {
$oldID);
}
- Horde::logMessage('SQL Query by Horde_Auth_Cyrsql::updateUser(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by Horde_Auth_Cyrsql::updateUser(): ' . $query, 'DEBUG');
$res = $this->_db->query($query, $values);
if ($res instanceof PEAR_Error) {
} catch (Horde_Kolab_Session_Exception_Badlogin $e) {
throw new Horde_Auth_Exception('', Horde_Auth::REASON_BADLOGIN);
} catch (Horde_Kolab_Session_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
throw new Horde_Auth_Exception('', Horde_Auth::REASON_FAILED);
}
$this->_params['version'],
@ldap_errno($this->_ds),
@ldap_error($this->_ds)),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ 'ERR');
}
}
sprintf('STARTTLS failed: [%d] %s',
@ldap_errno($this->_ds),
@ldap_error($this->_ds)),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ 'ERR');
}
}
sprintf('Unable to disable directory referrals on this connection to Active Directory: [%d] %s',
@ldap_errno($this->_ds),
@ldap_error($this->_ds)),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ 'ERR');
}
}
$search = @$func($this->_ds, $this->_params['basedn'], $filter,
array($this->_params['uid']));
if (!$search) {
- Horde::logMessage(ldap_error($this->_ds), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage(ldap_error($this->_ds), 'ERR');
throw new Horde_Auth_Exception(_("Could not search the LDAP server."));
}
$lookupshadow['shadowmin'] = $this->_params['minage'];
$lookupshadow['shadowmax'] = $this->_params['maxage'];
} else {
- Horde::logMessage('Wrong time format: ' . $information[0]['passwordexpirationtime'][0], __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage('Wrong time format: ' . $information[0]['passwordexpirationtime'][0], 'ERR');
}
} else {
if (isset($information[0]['shadowmax'][0])) {
try {
$this->_read();
} catch (Horde_Auth_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
throw new Horde_Auth_Exception('', Horde_Auth::REASON_FAILED);
}
time(),
$_SERVER['REMOTE_ADDR'],
serialize($signup->data));
- Horde::logMessage('SQL query by Auth_Signup_sql::_queueSignup(): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL query by Auth_Signup_sql::_queueSignup(): ' . $query, 'DEBUG');
$stmt = $this->_write_db->prepare($query, null, MDB2_PREPARE_MANIP);
if (is_a($stmt, 'PEAR_Error')) {
- Horde::logMessage($stmt, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($stmt, 'ERR');
return $stmt;
}
$result = $stmt->execute($values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$stmt->free();
. ' WHERE user_name = ?');
if (is_a($stmt, 'PEAR_Error')) {
- Horde::logMessage($stmt, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($stmt, 'ERR');
return $stmt;
}
$result = $stmt->execute(array($user));
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
{
$stmt = $this->_db->prepare('SELECT * FROM ' . $this->_params['table'] . ' WHERE user_name = ?');
if (is_a($stmt, 'PEAR_Error')) {
- Horde::logMessage($stmt, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($stmt, 'ERR');
return $stmt;
}
$results = $stmt->execute(array($username));
if (is_a($results, 'PEAR_Error')) {
- Horde::logMessage($results, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($results, 'ERR');
return $results;
}
$data = $results->fetchRow(MDB2_FETCHMODE_ASSOC);
if (is_a($data, 'PEAR_Error')) {
- Horde::logMessage($data, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($data, 'ERR');
return $data;
} elseif (empty($data)) {
return PEAR::RaiseError(sprintf(_("User \"%s\" does not exist."), $name));
$query = 'SELECT * FROM ' . $this->_params['table'] . ' ORDER BY signup_date';
$result = $this->_db->query($query);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
} elseif (empty($result)) {
return array();
{
$stmt = $this->_write_db->prepare('DELETE FROM ' . $this->_params['table'] . ' WHERE user_name = ?', null, MDB2_PREPARE_MANIP);
if (is_a($stmt, 'PEAR_Error')) {
- Horde::logMessage($stmt, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($stmt, 'ERR');
return $stmt;
}
$result = $stmt->execute(array($username));
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$stmt->free();
try {
$this->_connect();
} catch (Horde_Auth_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
throw new Horde_Auth_Exception('', Horde_Auth::REASON_FAILED);
}
$this->_params['username_field']);
$values = array($userId);
- Horde::logMessage('SQL Query by Auth_sql::_authenticate(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by Auth_sql::_authenticate(): ' . $query, 'DEBUG');
$result = $this->_db->query($query, $values);
if ($result instanceof PEAR_Error) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
throw new Horde_Auth_Exception('', Horde_Auth::REASON_FAILED);
}
$this->_params['encryption'],
$this->_params['show_encryption']));
- Horde::logMessage('SQL Query by Auth_sql::addUser(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by Auth_sql::addUser(): ' . $query, 'DEBUG');
$result = $this->_write_db->query($query, $values);
if ($result instanceof PEAR_Error) {
$this->_params['username_field']);
$values = array($oldID);
- Horde::logMessage('SQL Query by Auth_sql:updateUser(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by Auth_sql:updateUser(): ' . $query, 'DEBUG');
$result = $this->_write_db->query($query, $values);
if ($result instanceof PEAR_Error) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
throw new Horde_Auth_Exception($result);
}
}
$this->_params['show_encryption']),
$userId);
- Horde::logMessage('SQL Query by Auth_sql::resetPassword(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by Auth_sql::resetPassword(): ' . $query, 'DEBUG');
$result = $this->_write_db->query($query, $values);
if ($result instanceof PEAR_Error) {
$this->_params['username_field']);
$values = array($userId);
- Horde::logMessage('SQL Query by Auth_sql::removeUser(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by Auth_sql::removeUser(): ' . $query, 'DEBUG');
$result = $this->_write_db->query($query, $values);
if ($result instanceof PEAR_Error) {
$this->_params['username_field'],
$this->_params['table']);
- Horde::logMessage('SQL Query by Auth_sql::listUsers(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by Auth_sql::listUsers(): ' . $query, 'DEBUG');
$res = $this->_db->getCol($query);
if ($res instanceof PEAR_Error) {
$this->_params['username_field']);
$values = array($userId);
- Horde::logMessage('SQL Query by Auth_sql::exists(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by Auth_sql::exists(): ' . $query, 'DEBUG');
$res = $this->_db->getOne($query, $values);
return ($res instanceof PEAR_Error)
{
public function setUp()
{
- @include_once 'Log.php';
- if (!defined('PEAR_LOG_DEBUG')) {
- $this->markTestSkipped('The PEAR_LOG_DEBUG constant is not available!');
- }
-
$this->session = $this->getMock('Horde_Kolab_Session_Interface');
$this->factory = $this->getMock('Horde_Kolab_Session_Factory_Interface');
$auth->authenticate('user', array('password' => 'test'), false);
$this->assertEquals(Horde_Auth::REASON_BADLOGIN, Horde_Auth::getAuthError());
}
-}
\ No newline at end of file
+}
{
public function setUp()
{
- @include_once 'Log.php';
- if (!defined('PEAR_LOG_DEBUG')) {
- $this->markTestSkipped('The PEAR_LOG_DEBUG constant is not available!');
- }
-
/** Provide the mock configuration for the server */
$config = array();
$config['ldap']['basedn'] = 'dc=test';
{
return $this->_credentials['userId'];
}
-}
\ No newline at end of file
+}
try {
$this->_connect();
} catch (Horde_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
return;
}
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
}
}
try {
$this->_connect();
} catch (Horde_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
return false;
}
$result = $this->_db->getOne($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return false;
} elseif (is_null($result)) {
/* No rows were found - cache miss */
- Horde::logMessage(sprintf('Cache miss: %s (Id %s newer than %d)', $okey, $key, $maxage), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Cache miss: %s (Id %s newer than %d)', $okey, $key, $maxage), 'DEBUG');
return false;
}
if ($this->_mc) {
$this->_mc->set($key, $result);
}
- Horde::logMessage(sprintf('Cache hit: %s (Id %s newer than %d)', $okey, $key, $maxage), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Cache hit: %s (Id %s newer than %d)', $okey, $key, $maxage), 'DEBUG');
return $result;
}
try {
$this->_connect();
} catch (Horde_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
return false;
}
? 0
: $this->_getLifetime($lifetime) + $timestamp;
- Horde::logMessage(sprintf('Cache set: %s (Id %s set at %d expires at %d)', $okey, $key, $timestamp, $expiration), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Cache set: %s (Id %s set at %d expires at %d)', $okey, $key, $timestamp, $expiration), 'DEBUG');
// Remove any old cache data and prevent duplicate keys
$query = 'DELETE FROM ' . $this->_params['table'] . ' WHERE cache_id=?';
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return false;
}
try {
$this->_connect();
} catch (Horde_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
return false;
}
$result = $this->_db->getRow($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return false;
}
$timestamp = time();
if (empty($result)) {
- Horde::logMessage(sprintf('Cache exists() miss: %s (Id %s newer than %d)', $okey, $key, $timestamp), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Cache exists() miss: %s (Id %s newer than %d)', $okey, $key, $timestamp), 'DEBUG');
return false;
}
- Horde::logMessage(sprintf('Cache exists() hit: %s (Id %s newer than %d)', $okey, $key, $timestamp), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Cache exists() hit: %s (Id %s newer than %d)', $okey, $key, $timestamp), 'DEBUG');
return true;
}
try {
$this->_connect();
} catch (Horde_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
return false;
}
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return false;
}
class Horde
{
/**
- * Log instance.
- *
- * @var Log
- */
- static protected $_logger;
-
- /**
* Has compression been started?
*
* @var boolean
static protected $_inlineScript = array();
/**
- * Logs a message to the global Horde log backend.
- *
- * @param mixed $message Either a string or an object with a
- * getMessage() method (e.g. PEAR_Error,
- * Exception).
- * @param string $file What file was the log function called from
- * (e.g. __FILE__)?
- * @param integer $line What line was the log function called from
- * (e.g. __LINE__)?
- * @param integer $priority The priority of the message. One of:
- * <pre>
- * PEAR_LOG_EMERG
- * PEAR_LOG_ALERT
- * PEAR_LOG_CRIT
- * PEAR_LOG_ERR
- * PEAR_LOG_WARNING
- * PEAR_LOG_NOTICE
- * PEAR_LOG_INFO
- * PEAR_LOG_DEBUG
- * </pre>
- */
- static public function logMessage($message, $file, $line,
- $priority = PEAR_LOG_INFO)
- {
- $logger = self::getLogger();
-
- if ($logger === false) {
- return;
- }
-
- if ($priority > $GLOBALS['conf']['log']['priority']) {
- return;
- }
-
- if ($message instanceof PEAR_Error) {
- $userinfo = $message->getUserInfo();
- $message = $message->getMessage();
- if (!empty($userinfo)) {
- if (is_array($userinfo)) {
- $old_error = error_reporting(0);
- $userinfo = implode(', ', $userinfo);
- error_reporting($old_error);
- }
- $message .= ': ' . $userinfo;
- }
- } elseif (is_object($message)) {
- if (is_callable(array($message, 'toString'))) {
- $message = $message->toString();
- } elseif (is_callable(array($message, 'getMessage'))) {
- $message = $message->getMessage();
- }
- }
-
- $app = isset($GLOBALS['registry'])
- ? $GLOBALS['registry']->getApp()
- : null;
- $message = '[' . ($app ? $app : 'horde') . '] ' . $message . ' [pid ' . getmypid() . ' on line ' . $line . ' of "' . $file . '"]';
-
- /* Make sure to log in the system's locale and timezone. */
- $locale = setlocale(LC_TIME, 0);
- setlocale(LC_TIME, 'C');
- $tz = getenv('TZ');
- @putenv('TZ');
-
- $logger->log($message, $priority);
-
- /* Restore original locale and timezone. */
- setlocale(LC_TIME, $locale);
- if ($tz) {
- @putenv('TZ=' . $tz);
- }
-
- return true;
- }
-
- /**
- * Get an instantiated instance of the configured logger, if enabled.
- * getLogger() will fatally exit if a Log object can not be
- * instantiated.
+ * Shortcut to logging method.
*
- * @return mixed Log object on success, false if disabled.
- * @throws Horde_Exception
+ * @see Horde_Core_Log_Logger
*/
- static public function getLogger()
+ static public function logMessage($event, $priority = 'INFO',
+ $options = array())
{
- global $conf;
-
- if (empty($conf['log']['enabled'])) {
- return false;
- }
-
- if (isset(self::$_logger)) {
- return self::$_logger;
- }
-
- // Try to make sure that we can log messages somehow.
- if (empty($conf['log']) ||
- empty($conf['log']['type']) ||
- empty($conf['log']['name']) ||
- empty($conf['log']['ident']) ||
- !isset($conf['log']['params'])) {
- throw new Horde_Exception('Horde is not correctly configured to log error messages. You must configure at least a text file log in horde/config/conf.php.');
- }
-
- self::$_logger = Log::singleton($conf['log']['type'],
- $conf['log']['name'],
- $conf['log']['ident'],
- $conf['log']['params']);
- if (!self::$_logger instanceof Log) {
- throw new Horde_Exception('An error has occurred. Furthermore, Horde encountered an error attempting to log this error. Please check your Horde logging configuration in horde/config/conf.php.');
- }
-
- return self::$_logger;
+ $options['trace'] = 2;
+ $GLOBALS['injector']->getInstance('Horde_Log_Logger')->log($event, $priority, $options);
}
/**
// Log the error via logMessage() if requested.
if ($log) {
- self::logMessage($error, $file, $line, PEAR_LOG_EMERG);
+ self::logMessage($error, 'EMERG');
}
if ($cli) {
static public function logDeprecated($errno, $errstr, $errfile, $errline,
$errcontext)
{
- self::logMessage($errstr, $errfile, $errline, PEAR_LOG_DEBUG);
+ self::logMessage(new ErrorException($errstr, 0, $errno, $errfile, $errline), 'DEBUG');
}
/**
// Return an error if neither main or vhosted versions of the config
// file exist.
if (!$was_included) {
- self::logMessage(sprintf('Failed to import configuration file "%s".', $config_dir . $config_file), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ self::logMessage(sprintf('Failed to import configuration file "%s".', $config_dir . $config_file), 'DEBUG');
return is_array($var_names) ? array() : null;
}
$used = array_keys(self::$_used);
sort($used);
$remaining = str_replace($used, array(), 'abcdefghijklmnopqrstuvwxyz');
- self::logMessage('Access key information for ' . $script, __FILE__, __LINE__);
- self::logMessage('Used labels: ' . implode(',', $labels), __FILE__, __LINE__);
- self::logMessage('Used keys: ' . implode('', $used), __FILE__, __LINE__);
- self::logMessage('Free keys: ' . $remaining, __FILE__, __LINE__);
+ self::logMessage('Access key information for ' . $script);
+ self::logMessage('Used labels: ' . implode(',', $labels));
+ self::logMessage('Used keys: ' . implode('', $used));
+ self::logMessage('Free keys: ' . $remaining);
return;
}
if ($error) {
$error = sprintf('Hook %s in application %s not called.', $hook, $app);
- self::logMessage($error, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ self::logMessage($error, 'DEBUG');
throw new Horde_Exception_HookNotSet($error);
}
try {
- self::logMessage(sprintf('Hook %s in application %s called.', $hook, $app), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ self::logMessage(sprintf('Hook %s in application %s called.', $hook, $app), 'DEBUG');
return call_user_func_array(array($hook_ob, $hook), $args);
} catch (Horde_Exception $e) {
- self::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ self::logMessage($e, 'ERR');
throw $e;
}
}
{
public function create(Horde_Injector $injector)
{
- return new Horde_Log_Logger(new Horde_Log_Handler_Null());
+ global $conf;
+
+ // Try to make sure that we can log messages somehow.
+ if (empty($conf['log']['enabled'])) {
+ $handler = new Horde_Log_Handler_Null();
+ } else {
+ switch ($conf['log']['type']) {
+ case 'file':
+ $handler = new Horde_Log_Handler_Stream($conf['log']['name'], $conf['log']['params']['append'] ? 'a+' : 'w+');
+ break;
+
+ case 'stream':
+ $handler = new Horde_Log_Handler_Stream($conf['log']['name']);
+ break;
+
+ case 'syslog':
+ $handler = new Horde_Log_Handler_Syslog();
+ break;
+
+ case 'null':
+ default:
+ $handler = new Horde_Log_Handler_Null();
+ break;
+ }
+
+ $handler->addFilter(constant('Horde_Log::' . $conf['log']['priority']));
+ }
+
+ return new Horde_Core_Log_Logger($handler);
}
public function equals(Horde_Injector_Binder $binder)
--- /dev/null
+<?php
+/**
+ * This class extends the base Horde_Log_Logger class to ensure that the log
+ * entries are consistently generated across the applications and framework
+ * libraries.
+ *
+ * Copyright 2010 The Horde Project (http://www.horde.org/)
+ *
+ * See the enclosed file COPYING for license information (LGPL). If you
+ * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
+ *
+ * @author Michael Slusarz <slusarz@curecanti.org>
+ * @package Horde_Core
+ */
+class Horde_Core_Log_Logger extends Horde_Log_Logger
+{
+ /**
+ * Logs a message to the global Horde log backend.
+ *
+ * @param mixed $event Either a string (log string), an array
+ * (containing 'level', 'message', and 'timestamp'
+ entries) or an object with a getMessage()
+ method (e.g. PEAR_Error, Exception,
+ ErrorException).
+ * @param mixed $priority The priority of the message. Integers
+ * correspond to Horde_Log constants. String
+ * values are auto translated to Horde_Log
+ * constants.
+ * @param array $options Additional options:
+ * <pre>
+ * 'file' - (string) The filename to use in the log message.
+ * 'line' - (integer) The file line to use in the log message.
+ * 'trace' - (integer) The trace level of the original log location.
+ * </pre>
+ */
+ public function log($event, $priority = 'INFO', $options = array())
+ {
+ /* If an array is passed in, assume that the caller knew what they
+ * were doing and pass it directly to the log backend. */
+ if (is_array($event)) {
+ parent::log($event, $priority);
+ exit;
+ }
+
+ if ($event instanceof Exception) {
+ $text = $event->getMessage();
+ if ($event instanceof ErrorException) {
+ $trace = array(
+ 'file' => $event->getFile(),
+ 'line' => $event->getLine()
+ );
+ } else {
+ $trace = reset($event->getTrace());
+ }
+ } else {
+ if ($event instanceof PEAR_Error) {
+ $userinfo = $event->getUserInfo();
+ $text = $event->getMessage();
+ if (!empty($userinfo)) {
+ if (is_array($userinfo)) {
+ $old_error = error_reporting(0);
+ $userinfo = implode(', ', $userinfo);
+ error_reporting($old_error);
+ }
+ $text .= ': ' . $userinfo;
+ }
+ } elseif (is_object($event)) {
+ $text = strval($event);
+ if (!is_string($text)) {
+ $text = is_callable(array($event, 'getMessage'))
+ ? $event->getMessage()
+ : '';
+ }
+ } else {
+ $text = $event;
+ }
+
+ $trace = debug_backtrace();
+ $trace = $trace[isset($options['trace']) ? ($options['trace'] - 1) : 0];
+ }
+
+ $file = isset($options['file'])
+ ? $options['file']
+ : $trace['file'];
+ $line = isset($options['line'])
+ ? $options['line']
+ : $trace['line'];
+
+ $app = isset($GLOBALS['registry'])
+ ? $GLOBALS['registry']->getApp()
+ : 'horde';
+
+ $message = ($app ? '[' . $app . '] ' : '') . $text . ' [pid ' . getmypid() . ' on line ' . $line . ' of "' . $file . '"]';
+
+ if (is_string($priority)) {
+ $priority = defined('Horde_Log::' . $priority)
+ ? constant('Horde_Log::' . $priority)
+ : Horde_Log::INFO;
+ }
+
+ /* Make sure to log in the system's locale and timezone. */
+ // TODO: Needed?
+ $locale = setlocale(LC_TIME, 0);
+ setlocale(LC_TIME, 'C');
+ $tz = getenv('TZ');
+ @putenv('TZ');
+
+ parent::log(array(
+ 'level' => $priority,
+ 'message' => $message,
+ //'timestamp'
+ ));
+
+ /* Restore original locale and timezone. */
+ // TODO: Needed?
+ setlocale(LC_TIME, $locale);
+ if ($tz) {
+ @putenv('TZ=' . $tz);
+ }
+ }
+
+}
}
/**
- * Stores cacheable member variables in the session at shutdown.
+ * Events to do on shutdown.
*/
public function __destruct()
{
}
/* Register memory tracker if logging in debug mode. */
- if (!empty($GLOBALS['conf']['log']['enabled']) &&
- ($GLOBALS['conf']['log']['priority'] == PEAR_LOG_DEBUG) &&
- function_exists('memory_get_peak_usage')) {
- Horde::logMessage('Max memory usage: ' . memory_get_peak_usage(true) . ' bytes', __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ if (function_exists('memory_get_peak_usage')) {
+ Horde::logMessage('Max memory usage: ' . memory_get_peak_usage(true) . ' bytes', 'DEBUG');
}
}
'noperms' => $api->noPerms
);
} catch (Horde_Exception $e) {
- Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($e, 'DEBUG');
}
}
}
throw new Horde_Exception('User is not authorized', self::AUTH_FAILURE);
}
- Horde::logMessage(sprintf('%s does not have READ permission for %s', Horde_Auth::getAuth() ? 'User ' . Horde_Auth::getAuth() : 'Guest user', $app), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('%s does not have READ permission for %s', Horde_Auth::getAuth() ? 'User ' . Horde_Auth::getAuth() : 'Guest user', $app), 'DEBUG');
throw new Horde_Exception(sprintf(_('%s is not authorized for %s.'), Horde_Auth::getAuth() ? 'User ' . Horde_Auth::getAuth() : 'Guest user', $this->applications[$app]['name']), self::PERMISSION_DENIED);
}
$_SESSION['_registry']['md5'][$name] = $md5sum = hash('md5', $data);
$id = $this->_getCacheId($name, false) . '|' . $md5sum;
if ($ob->set($id, $data, 86400)) {
- Horde::logMessage('Horde_Registry: stored ' . $name . ' with cache ID ' . $id, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Horde_Registry: stored ' . $name . ' with cache ID ' . $id, 'DEBUG');
}
}
}
$result = $GLOBALS['injector']->getInstance('Horde_Cache')->get($id, 86400);
if ($result !== false) {
$this->_cache[$name] = unserialize($result);
- Horde::logMessage('Horde_Registry: retrieved ' . $name . ' with cache ID ' . $id, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Horde_Registry: retrieved ' . $name . ' with cache ID ' . $id, 'DEBUG');
return true;
}
}
<api>beta</api>
</stability>
<license uri="http://www.gnu.org/copyleft/lesser.html">LGPL</license>
- <notes>* Add Horde_Themes:: class.
+ <notes>* Convert from PEAR Log to Horde_Log for logging.
+ * Add Horde_Themes:: class.
* Add Horde::nocacheUrl().
* Remove dependency on Horde_DOM package.
* Added Horde_Registry_Api:: and Horde_Registry_Application:: classes.
<dir name="Factory">
<file name="KolabServer.php" role="php" />
</dir> <!-- /lib/Horde/Core/Factory -->
+ <dir name="Log">
+ <file name="Logger.php" role="php" />
+ </dir> <!-- /lib/Horde/Core/Log -->
<dir name="Notification">
<file name="Status.php" role="php" />
</dir> <!-- /lib/Horde/Core/Notification -->
</package>
<package>
<name>Log</name>
- <channel>pear.php.net</channel>
+ <channel>pear.horde.org</channel>
</package>
<package>
<name>Prefs</name>
<install name="lib/Horde/Core/Binder/Perms.php" as="Horde/Core/Binder/Perms.php" />
<install name="lib/Horde/Core/Binder/Template.php" as="Horde/Core/Binder/Template.php" />
<install name="lib/Horde/Core/Factory/KolabServer.php" as="Horde/Core/Factory/KolabServer.php" />
+ <install name="lib/Horde/Core/Log/Logger.php" as="Horde/Core/Log/Logger.php" />
<install name="lib/Horde/Core/Notification/Status.php" as="Horde/Core/Notification/Status.php" />
<install name="lib/Horde/ErrorHandler.php" as="Horde/ErrorHandler.php" />
<install name="lib/Horde/Exception/HookNotSet.php" as="Horde/Exception/HookNotSet.php" />
{
$query = 'SELECT DISTINCT group_uid FROM ' . $this->_params['table'];
- Horde::logMessage('SQL Query by DataTree_sql::getGroups(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by DataTree_sql::getGroups(): ' . $query, 'DEBUG');
return $this->_db->getCol($query);
}
return true;
}
- Horde::logMessage('SQL Query by DataTree_sql::_load(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by DataTree_sql::_load(): ' . $query, 'DEBUG');
$data = $this->_db->getAll($query);
if (is_a($data, 'PEAR_Error')) {
return $data;
if (empty($query)) {
return 0;
}
- Horde::logMessage('SQL Query by DataTree_sql::_count(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by DataTree_sql::_count(): ' . $query, 'DEBUG');
return (int)$this->_db->getOne($query);
}
$values = array($root,
$this->_params['group']);
- Horde::logMessage('SQL Query by DataTree_sql::_buildParentIds(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by DataTree_sql::_buildParentIds(): ' . $query . ', ' . var_export($values, true), 'DEBUG');
$root = $this->_db->getAssoc($query, false, $values);
if (is_a($root, 'PEAR_Error') || !count($root)) {
return '';
$this->_params['table'],
$in,
$this->_db->quote($this->_params['group']));
- Horde::logMessage('SQL Query by DataTree_sql::_loadById(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by DataTree_sql::_loadById(): ' . $query, 'DEBUG');
$parents = $this->_db->getAssoc($query);
if (is_a($parents, 'PEAR_Error')) {
return $parents;
' AND group_uid = ? ORDER BY datatree_id';
$values = array_merge($ids, array($this->_params['group']));
- Horde::logMessage('SQL Query by DataTree_sql::_loadById(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by DataTree_sql::_loadById(): ' . $query . ', ' . var_export($values, true), 'DEBUG');
$data = $this->_db->getAll($query, $values);
if (is_a($data, 'PEAR_Error')) {
return $data;
$object_parents = '';
foreach ($object_names as $name) {
$values = array($this->_params['group'], $name, $object_parents);
- Horde::logMessage('SQL Query by DataTree_sql::_exists(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by DataTree_sql::_exists(): ' . $query . ', ' . var_export($values, true), 'DEBUG');
$result = $this->_db->getOne($query, $values);
if (is_a($result, 'PEAR_Error') || !$result) {
$query = 'SELECT datatree_name FROM ' . $this->_params['table'] .
' WHERE group_uid = ? AND datatree_id = ?';
$values = array($this->_params['group'], (int)$id);
- Horde::logMessage('SQL Query by DataTree_sql::_getName(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by DataTree_sql::_getName(): ' . $query . ', ' . var_export($values, true), 'DEBUG');
$name = $this->_db->getOne($query, $values);
if (is_a($name, 'PEAR_Error')) {
/* Get the next unique ID. */
$id = $this->_write_db->nextId($this->_params['table']);
if (is_a($id, 'PEAR_Error')) {
- Horde::logMessage($id, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($id, 'ERR');
return $id;
}
(int)$ser,
$parents);
- Horde::logMessage('SQL Query by DataTree_sql::add(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by DataTree_sql::add(): ' . $query . ', ' . var_export($values, true), 'DEBUG');
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$reorder = $this->reorder($parents, $order, $id);
if (is_a($reorder, 'PEAR_Error')) {
- Horde::logMessage($reorder, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($reorder, 'ERR');
return $reorder;
}
$this->_write_db->quote($parent),
is_null($order) ? 'NULL' : (int)$order) . $pquery;
- Horde::logMessage('SQL Query by DataTree_sql::reorder(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by DataTree_sql::reorder(): ' . $query, 'DEBUG');
$result = $this->_write_db->query($query);
} elseif (is_array($order)) {
/* Multi update. */
$values = array($this->_params['group'],
$parent);
- Horde::logMessage('SQL Query by DataTree_sql::reorder(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by DataTree_sql::reorder(): ' . $query . ', ' . var_export($values, true), 'DEBUG');
$result = $this->_db->getOne($query, $values);
if (is_a($result, 'PEAR_Error')) {
' SET datatree_order = ? WHERE datatree_id = ?';
$values = array($o_key, is_null($o_cid) ? NULL : (int)$o_cid);
- Horde::logMessage('SQL Query by DataTree_sql::reorder(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by DataTree_sql::reorder(): ' . $query . ', ' . var_export($values, true), 'DEBUG');
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
return $result;
$values = array(is_null($order) ? NULL : (int)$order,
(int)$id);
- Horde::logMessage('SQL Query by DataTree_sql::setOrder(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by DataTree_sql::setOrder(): ' . $query . ', ' . var_export($values, true), 'DEBUG');
return $this->_write_db->query($query, $values);
}
$values = array($this->_params['group'],
'%:' . (int)$id . '');
- Horde::logMessage('SQL Query by DataTree_sql::remove(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by DataTree_sql::remove(): ' . $query . ', ' . var_export($values, true), 'DEBUG');
$children = $this->_db->getAll($query, $values, DB_FETCHMODE_ASSOC);
if (count($children)) {
' WHERE datatree_id = ?';
$values = array((int)$id);
- Horde::logMessage('SQL Query by DataTree_sql::remove(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by DataTree_sql::remove(): ' . $query . ', ' . var_export($values, true), 'DEBUG');
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
return $result;
' WHERE datatree_id = ?';
$values = array((int)$id);
- Horde::logMessage('SQL Query by DataTree_sql::remove(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by DataTree_sql::remove(): ' . $query . ', ' . var_export($values, true), 'DEBUG');
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
return $result;
' WHERE datatree_id IN (?' . str_repeat(', ?', count($ids) - 1) . ')';
$values = $ids;
- Horde::logMessage('SQL Query by DataTree_sql::removeByIds(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by DataTree_sql::removeByIds(): ' . $query . ', ' . var_export($values, true), 'DEBUG');
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
return $result;
' WHERE datatree_id IN (?' . str_repeat(', ?', count($ids) - 1) . ')';
$values = $ids;
- Horde::logMessage('SQL Query by DataTree_sql::removeByIds(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by DataTree_sql::removeByIds(): ' . $query . ', ' . var_export($values, true), 'DEBUG');
return $this->_write_db->query($query, $values);
}
' WHERE datatree_name IN (?' . str_repeat(', ?', count($names) - 1) . ')';
$values = $names;
- Horde::logMessage('SQL Query by DataTree_sql::removeByNames(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by DataTree_sql::removeByNames(): ' . $query . ', ' . var_export($values, true), 'DEBUG');
$ids = $this->_db->getCol($query, 0, $values);
if (is_a($ids, 'PEAR_Error')) {
return $ids;
$old_parent_path . ':' . $id . ':%',
(int)$id);
- Horde::logMessage('SQL Query by DataTree_sql::move(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by DataTree_sql::move(): ' . $query . ', ' . var_export($values, true), 'DEBUG');
$rowset = $this->_db->query($query, $values);
if (is_a($rowset, 'PEAR_Error')) {
return $rowset;
$this->_write_db->quote($ppath),
(int)$row['datatree_id']);
- Horde::logMessage('SQL Query by DataTree_sql::move(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by DataTree_sql::move(): ' . $query, 'DEBUG');
$result = $this->_write_db->query($query);
if (is_a($result, 'PEAR_Error')) {
return $result;
$values = array(Horde_String::convertCharset($new_object_name, Horde_Nls::getCharset(), $this->_params['charset']),
(int)$id);
- Horde::logMessage('SQL Query by DataTree_sql::rename(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by DataTree_sql::rename(): ' . $query . ', ' . var_export($values, true), 'DEBUG');
$result = $this->_write_db->query($query, $values);
return is_a($result, 'PEAR_Error') ? $result : true;
$this->_params['table'],
implode(', ', $cid));
- Horde::logMessage('SQL Query by DataTree_sql::getData(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by DataTree_sql::getData(): ' . $query, 'DEBUG');
$result = $this->_db->getAssoc($query);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
' WHERE datatree_id = ?';
$values = array((int)$cid);
- Horde::logMessage('SQL Query by DataTree_sql::getData(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by DataTree_sql::getData(): ' . $query . ', ' . var_export($values, true), 'DEBUG');
$row = $this->_db->getRow($query, $values, DB_FETCHMODE_ASSOC);
$data = Horde_Serialize::unserialize($row['datatree_data'],
implode(', ', $cid),
$filter);
- Horde::logMessage('SQL Query by DataTree_sql::getAttributes(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by DataTree_sql::getAttributes(): ' . $query, 'DEBUG');
$rows = $this->_db->getAll($query, DB_FETCHMODE_ASSOC);
if (is_a($rows, 'PEAR_Error')) {
return $rows;
(int)$cid,
$filter);
- Horde::logMessage('SQL Query by DataTree_sql::getAttributes(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by DataTree_sql::getAttributes(): ' . $query, 'DEBUG');
$rows = $this->_db->getAll($query, DB_FETCHMODE_ASSOC);
for ($i = 0; $i < count($rows); $i++) {
$rows[$i]['value'] = Horde_String::convertCharset($rows[$i]['value'],
}
list($query, $values) = $aq;
- Horde::logMessage('SQL Query by DataTree_sql::countByAttributes(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by DataTree_sql::countByAttributes(): ' . $query . ', ' . var_export($values, true), 'DEBUG');
$result = $this->_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$row = $result->fetchRow();
if (is_a($row, 'PEAR_Error')) {
- Horde::logMessage($row, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($row, 'ERR');
return $row;
}
$query = $this->_db->modifyLimitQuery($query, $from, $count);
}
- Horde::logMessage('SQL Query by DataTree_sql::getByAttributes(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by DataTree_sql::getByAttributes(): ' . $query . ', ' . var_export($values, true), 'DEBUG');
$result = $this->_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
while ($row = $result->fetchRow()) {
$query = $this->_db->modifyLimitQuery($query, $from, $count);
}
- Horde::logMessage('SQL Query by DataTree_sql::getByAttributes(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by DataTree_sql::getByAttributes(): ' . $query . ', ' . var_export($values, true), 'DEBUG');
$result = $this->_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$where,
($direction == 1) ? 'DESC' : 'ASC');
- Horde::logMessage('SQL Query by DataTree_sql::sortByAttributes(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by DataTree_sql::sortByAttributes(): ' . $query, 'DEBUG');
$ordered_ids = $this->_db->getCol($query);
/* Make sure that some ids didn't get lost because has no such
$where,
$levelQuery);
- Horde::logMessage('SQL Query by DataTree_sql::getAttributeValues(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by DataTree_sql::getAttributeValues(): ' . $query, 'DEBUG');
$rows = $this->_db->getCol($query);
if (is_a($rows, 'PEAR_Error')) {
- Horde::logMessage($rows, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($rows, 'ERR');
}
return $rows;
' SET datatree_data = ? WHERE datatree_id = ?';
$values = array(NULL, (int)$id);
- Horde::logMessage('SQL Query by DataTree_sql::updateData(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by DataTree_sql::updateData(): ' . $query . ', ' . var_export($values, true), 'DEBUG');
$this->_write_db->query($query, $values);
/* Start a transaction. */
' WHERE datatree_id = ?';
$values = array((int)$id);
- Horde::logMessage('SQL Query by DataTree_sql::updateData(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by DataTree_sql::updateData(): ' . $query . ', ' . var_export($values, true), 'DEBUG');
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
$this->_write_db->rollback();
$attr['key'],
Horde_String::convertCharset($attr['value'], Horde_Nls::getCharset(), $this->_params['charset']));
- Horde::logMessage('SQL Query by DataTree_sql::updateData(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by DataTree_sql::updateData(): ' . $query . ', ' . var_export($values, true), 'DEBUG');
$result = $this->_write_db->execute($statement, $values);
if (is_a($result, 'PEAR_Error')) {
(int)$ser,
(int)$id);
- Horde::logMessage('SQL Query by DataTree_sql::updateData(): ' . $query . ', ' . var_export($values, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by DataTree_sql::updateData(): ' . $query . ', ' . var_export($values, true), 'DEBUG');
$result = $this->_write_db->query($query, $values);
return is_a($result, 'PEAR_Error') ? $result : true;
function execute()
{
- Horde::logMessage('Warning: Horde_Form::execute() called, should be overridden', __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Warning: Horde_Form::execute() called, should be overridden', 'DEBUG');
}
/**
} elseif ($subgroups) {
$groups = $this->getGroupMemberships($user, true);
if (is_a($groups, 'PEAR_Error')) {
- Horde::logMessage($groups, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($groups, 'ERR');
return false;
}
} else {
$users = $this->listUsers($gid);
if (is_a($users, 'PEAR_Error')) {
- Horde::logMessage($users, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($users, 'ERR');
return false;
}
return in_array($user, $users);
$results = $this->_db[$source]->getRow($sql,array(), DB_FETCHMODE_ASSOC);
if (is_a($results, 'PEAR_Error')) {
- Horde::logMessage($results, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($results, 'ERR');
}
$this->_listEntries[$gid] = $results;
$results = $this->_db[$newSource]->getRow($sql);
if (is_a($results, 'PEAR_Error')) {
- Horde::logMessage($results, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($results, 'ERR');
return $results;
}
$users = $this->_getAllMembers($gid, $subgroups);
if (is_a($users, 'PEAR_Error')) {
- Horde::logMessage($users, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($users, 'ERR');
return false;
}
$result = !empty($users[$user]);
sprintf('STARTTLS failed: [%d] %s',
@ldap_errno($this->_ds),
@ldap_error($this->_ds)),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ 'ERR');
}
}
if ($subgroups) {
$groups = $this->getGroupMemberships($user, true);
if (is_a($groups, 'PEAR_Error')) {
- Horde::logMessage($groups, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($groups, 'ERR');
return false;
}
if (!empty($this->_logger)) {
$this->_logger->error($result->getMessage());
} else {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
}
throw new Horde_Exception($result->getMessage());
}
return $result;
}
- Horde::logMessage(sprintf("%s starting up (sender=%s, recipients=%s, client_address=%s)",
- get_class($this), $this->_sender,
- join(', ',$this->_recipients),
+ Horde::logMessage(sprintf("%s starting up (sender=%s, recipients=%s, client_address=%s)",
+ get_class($this), $this->_sender,
+ join(', ',$this->_recipients),
$this->_client_address),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ 'DEBUG');
$result = $this->_parse($inh, $transport);
if (is_a($result, 'PEAR_Error')) {
return $result;
}
- Horde::logMessage(sprintf("%s successfully completed (sender=%s, recipients=%s, client_address=%s, id=%s)",
- get_class($this), $this->_sender,
- join(', ',$this->_recipients),
+ Horde::logMessage(sprintf("%s successfully completed (sender=%s, recipients=%s, client_address=%s, id=%s)",
+ get_class($this), $this->_sender,
+ join(', ',$this->_recipients),
$this->_client_address, $this->_id),
- __FILE__, __LINE__, PEAR_LOG_INFO);
+ 'INFO');
}
/**
}
if (empty($values['recipient'])) {
- $msg = 'Please provide one or more recipients.'
+ $msg = 'Please provide one or more recipients.'
. "\n\n" . $p->getUsage();
return PEAR::raiseError($msg, OUT_STDOUT | EX_USAGE);
}
$this->_fqhostname = strtolower($values['host']);
$this->_sasl_username = strtolower($values['user']);
- Horde::logMessage(sprintf("Arguments: %s", print_r($values, true)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf("Arguments: %s", print_r($values, true)), 'DEBUG');
Horde_Nls::setCharset('utf-8');
*/
if (!isset($conf['log'])) {
$conf['log']['enabled'] = true;
- $conf['log']['priority'] = PEAR_LOG_DEBUG;
+ $conf['log']['priority'] = 'DEBUG';
$conf['log']['type'] = 'syslog';
$conf['log']['name'] = LOG_MAIL;
$conf['log']['ident'] = 'kolabfilter';
}
}
-class Horde_Kolab_Filter_Argv_Parser extends Horde_Argv_Parser
+class Horde_Kolab_Filter_Argv_Parser extends Horde_Argv_Parser
{
public function parserError($msg)
{
/* Done with headers */
$state = RM_STATE_READING_BODY;
if ($from && $verify_from_header) {
- $rc = $this->_verify_sender($this->_sasl_username, $this->_sender,
+ $rc = $this->_verify_sender($this->_sasl_username, $this->_sender,
$from, $this->_client_address);
if (is_a($rc, 'PEAR_Error')) {
return $rc;
/* Rewrite from */
if (strpos($from, $rc) === false) {
Horde::logMessage(sprintf("Rewriting '%s' to '%s'",
- $from, $rc),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $from, $rc), 'DEBUG');
$rewrittenfrom = "From: $rc\r\n";
}
}
$subject = $regs[1];
$state = RM_STATE_READING_SUBJECT;
} else if (eregi('^Content-Type: text/calendar', $line)) {
- Horde::logMessage("Found iCal data in message",
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage("Found iCal data in message", 'DEBUG');
$ical = true;
} else if (eregi('^Message-ID: (.*)', $line, $regs)) {
$this->_id = $regs[1];
$port = 10025;
}
- $transport = &Horde_Kolab_Filter_Transport::factory($transport,
- array('host' => $host,
+ $transport = &Horde_Kolab_Filter_Transport::factory($transport,
+ array('host' => $host,
'port' => $port));
$tmpf = @fopen($this->_tmpfile, 'r');
}
/* Allow anything from localhost and
- * fellow Kolab-hosts
+ * fellow Kolab-hosts
*/
if ($client_addr == $local_addr) {
return true;
if ($sasluser) {
if (!in_array(strtolower($from), $allowed_addrs)) {
- Horde::logMessage(sprintf("%s is not an allowed From address for %s",
- $from, $sasluser), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf("%s is not an allowed From address for %s", $from, $sasluser), 'DEBUG');
return false;
}
} else {
foreach ($domains as $domain) {
- if (strtolower($fromdom) == $domain
+ if (strtolower($fromdom) == $domain
|| ($verify_subdomains
&& substr($fromdom, -strlen($domain)-1) == ".$domain")) {
if ($reject_forged_from_header) {
- Horde::logMessage(sprintf("%s is not an allowed From address for unauthenticated users.",
- $from), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf("%s is not an allowed From address for unauthenticated users.", $from), 'DEBUG');
return false;
} else {
require_once 'Horde/String.php';
require_once 'Horde/MIME.php';
/* Rewrite */
- Horde::logMessage(sprintf("%s is not an allowed From address for unauthenticated users, rewriting.",
- $from), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf("%s is not an allowed From address for unauthenticated users, rewriting.", $from), 'DEBUG');
if (property_exists($adr, 'personal')) {
- $name = str_replace(array("\\", '"'),
- array("\\\\",'\"'),
+ $name = str_replace(array("\\", '"'),
+ array("\\\\",'\"'),
MIME::decode($adr->personal, 'utf-8'));
} else {
$name = '';
/* Done with headers */
$headers_done = true;
} else if (eregi('^Content-Type: text/calendar', $line)) {
- Horde::logMessage("Found iCal data in message",
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage("Found iCal data in message", 'DEBUG');
$ical = true;
} else if (eregi('^Message-ID: (.*)', $line, $regs)) {
$this->_id = $regs[1];
}
Horde::logMessage(sprintf("Calling resmgr_filter(%s, %s, %s, %s)",
$this->_fqhostname, $this->_sender,
- $resource, $this->_tmpfile), __FILE__, __LINE__,
- PEAR_LOG_DEBUG);
+ $resource, $this->_tmpfile), 'DEBUG');
$r = new Kolab_Resource();
$rc = $r->handleMessage($this->_fqhostname, $this->_sender,
$resource, $this->_tmpfile);
/* Check if we still have recipients */
if (empty($this->_recipients)) {
- Horde::logMessage("No recipients left.",
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage("No recipients left.", 'DEBUG');
return;
} else {
$result = $this->_deliver($transport);
}
}
- Horde::logMessage("Filter_Incoming successfully completed.",
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage("Filter_Incoming successfully completed.", 'DEBUG');
}
/**
return $dn;
}
if (!$dn) {
- Horde::logMessage(sprintf('User %s does not exist!', $real_recipient),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('User %s does not exist!', $real_recipient), 'DEBUG');
}
try {
$user = $server->fetch($dn, 'Horde_Kolab_Server_Object_Kolab_User');
} catch (Horde_Kolab_Server_Exception $e) {
Horde::logMessage(sprintf('Failed fetching user object %s. Error was:',
- $dn, $e->getMessage()),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $dn, $e->getMessage()), 'DEBUG');
$user->code = OUT_LOG | EX_TEMPFAIL;
return $user;
}
array(), false);
}
Horde::logMessage(sprintf("Adding missing organizer '%s <%s>' to iCal.",
- $org_name, $org_email),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $org_name, $org_email), 'DEBUG');
$icaltxt = $iCal->exportvCalendar();
}
}
function embedICal($fqhostname, $sender, $recipients, $origfrom, $subject,
$tmpfname, $transport)
{
- Horde::logMessage(sprintf("Encapsulating iCal message forwarded by %s", $sender),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf("Encapsulating iCal message forwarded by %s", $sender), 'DEBUG');
$forwardtext = "This is an invitation forwarded by outlook and\n".
"was rectified by the Kolab server.\n".
list( $headers, $mime) = Kolab_Filter_Outlook::_mimeParse($requestText);
$parts = $mime->contentTypeMap();
if (count($parts) != 1 || $parts[1] != 'text/calendar') {
- Horde::logMessage("Message does not contain exactly one toplevel text/calendar part, passing through.",
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage("Message does not contain exactly one toplevel text/calendar part, passing through.", 'DEBUG');
return false;
}
$basepart = $mime->getBasePart();
*/
if (!isset($conf['kolab']['filter']['debug'])
|| !$conf['kolab']['filter']['debug']) {
- Horde::logMessage($msg, $file, $line, PEAR_LOG_ERR);
+ Horde::logMessage($msg, 'ERR');
} else {
$msg .= ' (Line ' . $frame['line'] . ' in ' . basename($frame['file']) . ")\n";
fwrite(STDOUT, $msg);
Horde::logMessage(sprintf("Starting Dovecot delivery process with UID %d, GID %d (sender=%s, recipient=%s) ...",
getmyuid(), getmygid(),
- $this->_envelopeSender, $recipient),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $this->_envelopeSender, $recipient), 'DEBUG');
$deliver = $conf['kolab']['filter']['dovecot_deliver'];
*/
function _stop_deliver()
{
- Horde::logMessage("Stoping Dovecot delivery process ...",
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage("Stoping Dovecot delivery process ...", 'DEBUG');
$retval = pclose($this->_deliver_fh);
- Horde::logMessage(sprintf("... return value was %d\n", $retval),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf("... return value was %d\n", $retval), 'DEBUG');
if ($retval != 0) {
return PEAR::raiseError('Dovecot LDA Backend delivery process signaled an error.');
}
if (is_array($dn)) {
if (count($dn) > 1) {
Horde::logMessage(sprintf("%s objects returned for %s",
- $count($dn), $resource),
- __FILE__, __LINE__, PEAR_LOG_WARNING);
+ $count($dn), $resource), 'WARN');
return false;
} else {
$dn = $dn[0];
$object['alarm'] = -$trigger / 60;
}
} else {
- Horde::logMessage('No TRIGGER in VALARM. ' . $trigger->getMessage(),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage('No TRIGGER in VALARM. ' . $trigger->getMessage(), 'ERR');
}
}
}
Horde::logMessage(sprintf('Assembled event object: %s',
- print_r($object, true)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ print_r($object, true)), 'DEBUG');
return $object;
}
$action = RM_ACT_MANUAL;
}
Horde::logMessage(sprintf('Action for %s is %s',
- $sender, $action),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $sender, $action), 'DEBUG');
// Get out as early as possible if manual
if ($action == RM_ACT_MANUAL) {
- Horde::logMessage(sprintf('Passing through message to %s', $id),
- __FILE__, __LINE__, PEAR_LOG_INFO);
+ Horde::logMessage(sprintf('Passing through message to %s', $id), 'INFO');
return true;
}
$iCalendar = &$this->_getICal($tmpfname);
if ($iCalendar === false) {
// No iCal in mail
- Horde::logMessage(sprintf('Could not parse iCalendar data, passing through to %s', $id),
- __FILE__, __LINE__, PEAR_LOG_INFO);
+ Horde::logMessage(sprintf('Could not parse iCalendar data, passing through to %s', $id), 'INFO');
return true;
}
// Get the event details out of the iTip request
$itip = &$iCalendar->findComponent('VEVENT');
if ($itip === false) {
- Horde::logMessage(sprintf('No VEVENT found in iCalendar data, passing through to %s', $id),
- __FILE__, __LINE__, PEAR_LOG_INFO);
+ Horde::logMessage(sprintf('No VEVENT found in iCalendar data, passing through to %s', $id), 'INFO');
return true;
}
$itip->getAttributeDefault('METHOD', 'REQUEST')));
// What resource are we managing?
- Horde::logMessage(sprintf('Processing %s method for %s', $method, $id),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Processing %s method for %s', $method, $id), 'DEBUG');
// This is assumed to be constant across event creation/modification/deletipn
$uid = $itip->getAttributeDefault('UID', '');
- Horde::logMessage(sprintf('Event has UID %s', $uid),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Event has UID %s', $uid), 'DEBUG');
// Who is the organiser?
$organiser = preg_replace('/^mailto:\s*/i', '', $itip->getAttributeDefault('ORGANIZER', ''));
- Horde::logMessage(sprintf('Request made by %s', $organiser),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Request made by %s', $organiser), 'DEBUG');
// What is the events summary?
$summary = $itip->getAttributeDefault('SUMMARY', '');
$dtend = $this->convert2epoch($itip->getAttributeDefault('DTEND', 0));
Horde::logMessage(sprintf('Event starts on <%s> %s and ends on <%s> %s.',
- $dtstart, $this->iCalDate2Kolab($dtstart), $dtend, $this->iCalDate2Kolab($dtend)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $dtstart, $this->iCalDate2Kolab($dtstart), $dtend, $this->iCalDate2Kolab($dtend)), 'DEBUG');
if ($action == RM_ACT_ALWAYS_REJECT) {
if ($method == 'REQUEST') {
- Horde::logMessage(sprintf('Rejecting %s method', $method),
- __FILE__, __LINE__, PEAR_LOG_INFO);
+ Horde::logMessage(sprintf('Rejecting %s method', $method), 'INFO');
$this->sendITipReply($cn, $resource, $itip, RM_ITIP_DECLINE,
$organiser, $uid, $is_update);
return false;
} else {
- Horde::logMessage(sprintf('Passing through %s method for ACT_ALWAYS_REJECT policy', $method),
- __FILE__, __LINE__, PEAR_LOG_INFO);
+ Horde::logMessage(sprintf('Passing through %s method for ACT_ALWAYS_REJECT policy', $method), 'INFO');
return true;
}
}
if (is_a($imap_error, 'PEAR_Error')) {
Horde::logMessage(sprintf('Failed accessing IMAP calendar: %s',
- $folder->getMessage()),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ $folder->getMessage()), 'ERR');
if ($action == RM_ACT_MANUAL_IF_CONFLICTS) {
return true;
}
switch ($method) {
case 'REQUEST':
if ($action == RM_ACT_MANUAL) {
- Horde::logMessage(sprintf('Passing through %s method', $method),
- __FILE__, __LINE__, PEAR_LOG_INFO);
+ Horde::logMessage(sprintf('Passing through %s method', $method), 'INFO');
break;
}
$vfbstart = $vfb->getAttributeDefault('DTSTART', 0);
$vfbend = $vfb->getAttributeDefault('DTEND', 0);
Horde::logMessage(sprintf('Free/busy info starts on <%s> %s and ends on <%s> %s',
- $vfbstart, $this->iCalDate2Kolab($vfbstart), $vfbend, $this->iCalDate2Kolab($vfbend)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $vfbstart, $this->iCalDate2Kolab($vfbstart), $vfbend, $this->iCalDate2Kolab($vfbend)), 'DEBUG');
if ($vfbstart && $dtstart > $this->convert2epoch ($vfbend)) {
$outofperiod=1;
// Check whether we are busy or not
$busyperiods = $vfb->getBusyPeriods();
Horde::logMessage(sprintf('Busyperiods: %s',
- print_r($busyperiods, true)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ print_r($busyperiods, true)), 'DEBUG');
$extraparams = $vfb->getExtraParams();
Horde::logMessage(sprintf('Extraparams: %s',
- print_r($extraparams, true)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ print_r($extraparams, true)), 'DEBUG');
$conflict = false;
if (!empty($object['recurrence'])) {
$recurrence = new Horde_Date_Recurrence(time());
Horde::logMessage(sprintf('Busy period from %s to %s',
strftime('%a, %d %b %Y %H:%M:%S %z', $busyfrom),
strftime('%a, %d %b %Y %H:%M:%S %z', $busyto)
- ),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ ), 'DEBUG');
if ((isset($extraparams[$busyfrom]['X-UID'])
&& in_array(base64_decode($extraparams[$busyfrom]['X-UID']), $ignore))
|| (isset($extraparams[$busyfrom]['X-SID'])
continue;
}
if (($busyfrom >= $dtstart && $busyfrom < $dtend) || ($dtstart >= $busyfrom && $dtstart < $busyto)) {
- Horde::logMessage('Request overlaps',
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Request overlaps', 'DEBUG');
$conflict = true;
break;
}
if ($conflict) {
if ($action == RM_ACT_MANUAL_IF_CONFLICTS) {
//sendITipReply(RM_ITIP_TENTATIVE);
- Horde::logMessage('Conflict detected; Passing mail through',
- __FILE__, __LINE__, PEAR_LOG_INFO);
+ Horde::logMessage('Conflict detected; Passing mail through', 'INFO');
return true;
} else if ($action == RM_ACT_REJECT_IF_CONFLICTS) {
- Horde::logMessage('Conflict detected; rejecting',
- __FILE__, __LINE__, PEAR_LOG_INFO);
+ Horde::logMessage('Conflict detected; rejecting', 'INFO');
$this->sendITipReply($cn, $id, $itip, RM_ITIP_DECLINE,
$organiser, $uid, $is_update);
return false;
}
if (is_a($imap_error, 'PEAR_Error')) {
- Horde::logMessage('Could not access users calendar; rejecting',
- __FILE__, __LINE__, PEAR_LOG_INFO);
+ Horde::logMessage('Could not access users calendar; rejecting', 'INFO');
$this->sendITipReply($cn, $id, $itip, RM_ITIP_DECLINE,
$organiser, $uid, $is_update);
return false;
// was specified; either way we add the new event & send an 'ACCEPT'
// iTip reply
- Horde::logMessage(sprintf('Adding event %s', $uid),
- __FILE__, __LINE__, PEAR_LOG_INFO);
+ Horde::logMessage(sprintf('Adding event %s', $uid), 'INFO');
if (!empty($conf['kolab']['filter']['simple_locks'])) {
if (!empty($conf['kolab']['filter']['simple_locks_timeout'])) {
$counter++;
}
if ($counter == $timeout) {
- Horde::logMessage(sprintf('Lock timeout of %s seconds exceeded. Rejecting invitation.', $timeout),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage(sprintf('Lock timeout of %s seconds exceeded. Rejecting invitation.', $timeout), 'ERR');
$this->sendITipReply($cn, $id, $itip, RM_ITIP_DECLINE,
$organiser, $uid, $is_update);
return false;
}
$result = file_put_contents($lockfile, 'LOCKED');
if ($result === false) {
- Horde::logMessage(sprintf('Failed creating lock file %s.', $lockfile),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage(sprintf('Failed creating lock file %s.', $lockfile), 'ERR');
} else {
$this->lockfile = $lockfile;
}
} else {
- Horde::logMessage(sprintf('The lock directory %s is missing. Disabled locking.', $lockdir),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage(sprintf('The lock directory %s is missing. Disabled locking.', $lockdir), 'ERR');
}
}
if ($outofperiod) {
$this->sendITipReply($cn, $resource, $itip, RM_ITIP_TENTATIVE,
$organiser, $uid, $is_update);
- Horde::logMessage('No freebusy information available',
- __FILE__, __LINE__, PEAR_LOG_NOTICE);
+ Horde::logMessage('No freebusy information available', 'NOTICE');
} else {
$this->sendITipReply($cn, $resource, $itip, RM_ITIP_ACCEPT,
$organiser, $uid, $is_update);
return false;
case 'CANCEL':
- Horde::logMessage(sprintf('Removing event %s', $uid),
- __FILE__, __LINE__, PEAR_LOG_INFO);
+ Horde::logMessage(sprintf('Removing event %s', $uid), 'INFO');
if (is_a($imap_error, 'PEAR_Error')) {
$body = sprintf(_("Unable to access %s's calendar:"), $resource) . "\n\n" . $summary;
$subject = sprintf(_("Error processing \"%s\""), $summary);
} else if (!$data->objectUidExists($uid)) {
Horde::logMessage(sprintf('Canceled event %s is not present in %s\'s calendar',
- $uid, $resource),
- __FILE__, __LINE__, PEAR_LOG_WARNING);
+ $uid, $resource), 'WARNING');
$body = sprintf(_("The following event that was canceled is not present in %s's calendar:"), $resource) . "\n\n" . $summary;
$subject = sprintf(_("Error processing \"%s\""), $summary);
} else {
* Delete any old events that we updated
*/
Horde::logMessage(sprintf('Deleting %s because of cancel',
- $uid),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $uid), 'DEBUG');
$result = $data->delete($uid);
if (is_a($result, 'PEAR_Error')) {
Horde::logMessage(sprintf('Deleting %s failed with %s',
- $uid, $result->getMessage()),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $uid, $result->getMessage()), 'DEBUG');
}
$body = _("The following event has been successfully removed:") . "\n\n" . $summary;
$subject = sprintf(_("%s has been cancelled"), $summary);
}
- Horde::logMessage(sprintf('Sending confirmation of cancelation to %s', $organiser),
- __FILE__, __LINE__, PEAR_LOG_WARNING);
+ Horde::logMessage(sprintf('Sending confirmation of cancelation to %s', $organiser), 'WARNING');
$body = new MIME_Part('text/plain', Horde_String::wrap($body, 76, "\n", 'utf-8'), 'utf-8');
$mime = &MIME_Message::convertMimePart($body);
return $result;
}
- Horde::logMessage('Successfully sent cancellation reply',
- __FILE__, __LINE__, PEAR_LOG_INFO);
+ Horde::logMessage('Successfully sent cancellation reply', 'INFO');
return false;;
// We either don't currently handle these iTip methods, or they do not
// apply to what we're trying to accomplish here
Horde::logMessage(sprintf('Ignoring %s method and passing message through to %s',
- $method, $resource),
- __FILE__, __LINE__, PEAR_LOG_INFO);
+ $method, $resource), 'INFO');
return true;
}
}
if (!empty($this->lockfile)) {
@unlink($this->lockfile);
if (file_exists($this->lockfile)) {
- Horde::logMessage(sprintf('Failed removing the lockfile %s.', $lockfile),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage(sprintf('Failed removing the lockfile %s.', $lockfile), 'ERR');
}
$this->lockfile = null;
}
$organiser, $uid, $is_update)
{
Horde::logMessage(sprintf('sendITipReply(%s, %s, %s, %s)',
- $cn, $resource, get_class($itip), $type),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $cn, $resource, get_class($itip), $type), 'DEBUG');
// Build the reply.
$vCal = new Horde_iCalendar();
switch ($type) {
case RM_ITIP_DECLINE:
Horde::logMessage(sprintf('Sending DECLINE iTip reply to %s',
- $organiser),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $organiser), 'DEBUG');
$message = $is_update
? sprintf(_("%s has declined the update to the following event:"), $resource) . "\n\n" . $summary
: sprintf(_("%s has declined the invitation to the following event:"), $resource) . "\n\n" . $summary;
break;
case RM_ITIP_ACCEPT:
- Horde::logMessage(sprintf('Sending ACCEPT iTip reply to %s', $organiser),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Sending ACCEPT iTip reply to %s', $organiser), 'DEBUG');
$message = $is_update
? sprintf(_("%s has accepted the update to the following event:"), $resource) . "\n\n" . $summary
: sprintf(_("%s has accepted the invitation to the following event:"), $resource) . "\n\n" . $summary;
break;
case RM_ITIP_TENTATIVE:
- Horde::logMessage(sprintf('Sending TENTATIVE iTip reply to %s', $organiser),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Sending TENTATIVE iTip reply to %s', $organiser), 'DEBUG');
$message = $is_update
? sprintf(_("%s has tentatively accepted the update to the following event:"), $resource) . "\n\n" . $summary
: sprintf(_("%s has tentatively accepted the invitation to the following event:"), $resource) . "\n\n" . $summary;
break;
default:
- Horde::logMessage(sprintf('Unknown iTip method (%s passed to sendITipReply())', $type),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage(sprintf('Unknown iTip method (%s passed to sendITipReply())', $type), 'ERR');
}
$itip_reply->setAttribute('ATTENDEE', 'MAILTO:' . $resource, $params);
return $result;
}
- Horde::logMessage('Successfully sent iTip reply',
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Successfully sent iTip reply', 'DEBUG');
}
function iCalDate2Kolab($ical_date, $type= ' ')
{
Horde::logMessage(sprintf('Converting to kolab format %s',
- print_r($ical_date, true)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ print_r($ical_date, true)), 'DEBUG');
// $ical_date should be a timestamp
if (is_array($ical_date)) {
} else {
$date = gmstrftime('%Y-%m-%dT%H:%M:%SZ', $ical_date);
}
- Horde::logMessage(sprintf('To <%s>', $date),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('To <%s>', $date), 'DEBUG');
return $date;
}
function convert2epoch($values)
{
Horde::logMessage(sprintf('Converting to epoch %s',
- print_r($values, true)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ print_r($values, true)), 'DEBUG');
if (is_array($values)) {
$temp = $this->cleanArray($values);
$epoch = $values;
}
- Horde::logMessage(sprintf('Converted <%s>', $epoch),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Converted <%s>', $epoch), 'DEBUG');
return $epoch;
}
}
$url = self::getUrl($resource);
Horde::logMessage(sprintf('Freebusy URL for resource %s is %s',
- $resource, $url),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $resource, $url), 'DEBUG');
list($user, $domain) = explode('@', $resource);
if (empty($domain)) {
return $vfb;
}
-}
\ No newline at end of file
+}
$owner = $folder->getOwner();
} catch (Exception $e) {
Horde::logMessage(sprintf("Error while updating the Kolab folder list cache: %s.",
- $e->getMessage()), __FILE__, __LINE__, PEAR_LOG_ERR);
+ $e->getMessage()), 'ERR');
return;
}
$result = $this->_folder->trigger();
if (is_a($result, 'PEAR_Error')) {
Horde::logMessage(sprintf('Failed triggering folder %s!',
- $this->_folder->name),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ $this->_folder->name), 'ERR');
}
return true;
false);
$text = $mime[0];
} catch (Horde_Kolab_Storage_Exception $e) {
- Horde::logMessage($mime, __FILE__, __LINE__, PEAR_LOG_WARNING);
+ Horde::logMessage($mime, 'WARN');
$text = false;
}
if (is_a($object, 'PEAR_Error')) {
$this->_cache->ignore($id);
$object->addUserInfo('STORAGE ID: ' . $id);
- Horde::logMessage($object, __FILE__, __LINE__,
- PEAR_LOG_WARNING);
+ Horde::logMessage($object, 'WARN');
continue;
}
} else {
if (is_a($result, 'PEAR_Error')) {
Horde::logMessage(sprintf('Failed storing attachment of object %s: %s',
$id,
- $result->getMessage()),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ $result->getMessage()), 'ERR');
$object = false;
break;
}
if (isset($attributes['type'])) {
if ($attributes['type'] != $type) {
Horde::logMessage(sprintf('Cannot modify the type of a folder from %s to %s!',
- $type, $attributes['type']),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ $type, $attributes['type']), 'ERR');
}
unset($attributes['type']);
}
$this->_connection->delete($this->name);
} catch (Exception $e) {
Horde::logMessage(sprintf('Failed handling the dummy folder: %s!',
- $e->getMessage()),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ $e->getMessage()), 'ERR');
}
$this->name = $this->new_name;
if (isset($attributes['owner'])) {
if ($attributes['owner'] != $this->getOwner()) {
Horde::logMessage(sprintf('Cannot modify the owner of a folder from %s to %s!',
- $this->getOwner(), $attributes['owner']),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ $this->getOwner(), $attributes['owner']), 'ERR');
}
unset($attributes['owner']);
}
$this->trigger();
} catch (Horde_Kolab_Storage_Exception $e) {
Horde::logMessage(sprintf('Failed triggering folder %s! Error was: %s',
- $this->name, $e->getMessage()),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ $this->name, $e->getMessage()), 'ERR');
}
return true;
$result = $this->trigger();
} catch (Horde_Kolab_Storage_Exception $e) {
Horde::logMessage(sprintf('Failed triggering folder %s! Error was: %s',
- $this->name, $result->getMessage()),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ $this->name, $result->getMessage()), 'ERR');
}
}
$result = $this->trigger();
if (is_a($result, 'PEAR_Error')) {
Horde::logMessage(sprintf('Failed triggering folder %s! Error was: %s',
- $this->name, $result->getMessage()),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ $this->name, $result->getMessage()), 'ERR');
}
return true;
$result = $this->trigger();
if (is_a($result, 'PEAR_Error')) {
Horde::logMessage(sprintf('Failed triggering folder %s! Error was: %s',
- $this->name, $result->getMessage()),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ $this->name, $result->getMessage()), 'ERR');
}
return $success;
}
return $handlers[$type];
}
Horde::logMessage(sprintf('Loading format handler "%s" failed: %s',
- $type, $handlers[$type]->getMessage()),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ $type, $handlers[$type]->getMessage()), 'ERR');
continue;
}
}
$this->trigger();
} catch (Horde_Kolab_Storage_Exception $e) {
Horde::logMessage(sprintf('Failed triggering folder %s! Error was: %s',
- $this->name, $result->getMessage()),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ $this->name, $result->getMessage()), 'ERR');
}
return true;
$result = $this->trigger();
if (is_a($result, 'PEAR_Error')) {
Horde::logMessage(sprintf('Failed triggering folder %s! Error was: %s',
- $this->name, $result->getMessage()),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ $this->name, $result->getMessage()), 'ERR');
}
return $result;
$result = $this->trigger();
if (is_a($result, 'PEAR_Error')) {
Horde::logMessage(sprintf('Failed triggering folder %s! Error was: %s',
- $this->name, $result->getMessage()),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ $this->name, $result->getMessage()), 'ERR');
}
return $iresult;
$data = $this->_annotation_data->getObject('KOLAB_FOLDER_CONFIGURATION');
if (is_a($data, 'PEAR_Error')) {
Horde::logMessage(sprintf('Error retrieving annotation data on folder %s: %s',
- $this->name, $data->getMessage()),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ $this->name, $data->getMessage()), 'ERR');
return '';
}
if (isset($data[$key])) {
$data = $this->_annotation_data->getObject('KOLAB_FOLDER_CONFIGURATION');
if (is_a($data, 'PEAR_Error')) {
Horde::logMessage(sprintf('Error retrieving annotation data on folder %s: %s',
- $this->name, $data->getMessage()),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ $this->name, $data->getMessage()), 'ERR');
$data = array();
$uid = null;
} else {
public function getLockInfo($lockid)
{
if (is_a(($result = $this->_connect()), 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
throw new Horde_Lock_Exception(_("Internal database error. Details have been logged for the administrator."));
}
' WHERE lock_id = ? AND lock_expiry_timestamp >= ?';
$values = array($lockid, $now);
- Horde::logMessage('SQL Query by Horde_Lock_sql::getLockInfo(): ' . $sql,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by Horde_Lock_sql::getLockInfo(): ' . $sql, 'DEBUG');
$result = $this->_db->query($sql, $values);
if (is_a($result, 'PEAR_Error')) {
throw new Horde_Lock_Exception($result->getMessage());
public function getLocks($scope = null, $principal = null, $type = null)
{
if (is_a(($result = $this->_connect()), 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
throw new Horde_Lock_Exception(_("Internal database error. Details have been logged for the administrator."));
}
$values[] = $type;
}
- Horde::logMessage('SQL Query by Horde_Lock_sql::getLocks(): ' . $sql,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by Horde_Lock_sql::getLocks(): ' . $sql, 'DEBUG');
$result = $this->_db->query($sql, $values);
if (is_a($result, 'PEAR_Error')) {
throw new Horde_Lock_Exception($result->getMessage());
public function resetLock($lockid, $extend)
{
if (is_a(($result = $this->_connect()), 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
throw new Horde_Lock_Exception(_("Internal database error. Details have been logged for the administrator."));
}
'WHERE lock_id = ?';
$values = array($now, $expiry, $lockid);
- Horde::logMessage('SQL Query by Horde_Lock_sql::resetLock(): ' .
- $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by Horde_Lock_sql::resetLock(): ' . $sql, 'DEBUG');
$result = $this->_write_db->query($sql, $values);
if (is_a($result, 'PEAR_Error')) {
throw new Horde_Lock_Exception($result->getMessage());
}
- Horde::logMessage(sprintf('Lock %s reset successfully.', $lockid), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Lock %s reset successfully.', $lockid), 'DEBUG');
return true;
} elseif (is_a($lockinfo, 'PEAR_Error')) {
throw new Horde_Lock_Exception($lockinfo->getMessage());
$lifetime = 1, $type = self::TYPE_SHARED)
{
if (is_a(($result = $this->_connect()), 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
throw new Horde_Lock_Exception(_("Internal database error. Details have been logged for the administrator."));
}
if (count($oldlocks) != 0) {
// An exclusive lock exists. Deny the new request.
- Horde::logMessage(sprintf('Lock requested for %s denied due to existing exclusive lock.', $principal), __FILE__, __LINE__, PEAR_LOG_NOTICE);
+ Horde::logMessage(sprintf('Lock requested for %s denied due to existing exclusive lock.', $principal), 'NOTICE');
return false;
}
$values = array($lockid, $requestor, $scope, $principal, $now, $now,
$expiration, $type);
- Horde::logMessage('SQL Query by Horde_Lock_sql::setLock(): ' . $sql,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by Horde_Lock_sql::setLock(): ' . $sql, 'DEBUG');
$result = $this->_write_db->query($sql, $values);
if (is_a($result, 'PEAR_Error')) {
throw new Horde_Lock_Exception($result->getMessage());
}
- Horde::logMessage(sprintf('Lock %s set successfully by %s in scope %s on "%s"', $lockid, $requestor, $scope, $principal), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Lock %s set successfully by %s in scope %s on "%s"', $lockid, $requestor, $scope, $principal), 'DEBUG');
return $lockid;
}
public function clearLock($lockid)
{
if (is_a(($result = $this->_connect()), 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
throw new Horde_Lock_Exception(_("Internal database error. Details have been logged for the administrator."));
}
$sql = 'DELETE FROM ' . $this->_params['table'] . ' WHERE lock_id = ?';
$values = array($lockid);
- Horde::logMessage('SQL Query by Horde_Lock_sql::clearLock(): ' . $sql,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by Horde_Lock_sql::clearLock(): ' . $sql, 'DEBUG');
$result = $this->_write_db->query($sql, $values);
if (is_a($result, 'PEAR_Error')) {
throw new Horde_Lock_Exception($result->getMessage());
}
- Horde::logMessage(sprintf('Lock %s cleared successfully.', $lockid), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Lock %s cleared successfully.', $lockid), 'DEBUG');
return true;
}
try {
Horde_Util::assertDriverConfig($this->_params, array('phptype'), 'Lock SQL');
} catch (Horde_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
throw new Horde_Lock_Exception($e);
}
'ssl' => !empty($this->_params['ssl']))
);
if (is_a($this->_write_db, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
throw new Horde_Lock_Exception($this->_write_db->getMessage());
}
'ssl' => !empty($params['ssl']))
);
if (is_a($this->_db, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
throw new Horde_Lock_Exception($this->_db->getMessage());
}
private function _doGC()
{
if (is_a(($result = $this->_connect()), 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return false;
}
'lock_expiry_timestamp < ? AND lock_expiry_timestamp != 0';
$values = array($now);
- Horde::logMessage('SQL Query by Horde_Lock_sql::_doGC(): ' . $sql,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by Horde_Lock_sql::_doGC(): ' . $sql, 'DEBUG');
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return false;
}
- Horde::logMessage(sprintf('Lock garbage collection cleared %d locks.', $this->_write_db->affectedRows()), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Lock garbage collection cleared %d locks.', $this->_write_db->affectedRows()), 'DEBUG');
return true;
}
// Force consistent hashing
ini_set('memcache.hash_strategy', 'consistent');
- Horde::logMessage('Connected to the following memcache servers:' . implode($servers, ', '), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Connected to the following memcache servers:' . implode($servers, ', '), 'DEBUG');
}
/**
*/
public function push(Horde_Notification_Event $event, $options)
{
- Horde::logMessage($event->message, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($event->message, 'DEBUG');
}
}
try {
$permission = $this->getPermission($permission);
} catch (Horde_Perms_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($e, 'DEBUG');
return false;
}
}
$result = $this->_setValue($pref, $val, true, $convert);
- Horde::logMessage(__CLASS__ . ': Storing preference value (' . $pref . ')', __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(__CLASS__ . ': Storing preference value (' . $pref . ')', 'DEBUG');
if ($result && $this->isDirty($pref)) {
$scope = $this->_getPreferenceScope($pref);
// Sanity check for directory
$error = false;
if (empty($params['directory']) || !is_dir($params['directory'])) {
- Horde::logMessage(_("Preference storage directory is not available."), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage(_("Preference storage directory is not available."), 'ERR');
$error = true;
} elseif (!is_writable($params['directory'])) {
- Horde::logMessage(sprintf(_("Directory %s is not writeable"), $params['directory']), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage(sprintf(_("Directory %s is not writeable"), $params['directory']), 'ERR');
$error = true;
}
$prefs = $this->_imsp->get($scope . '.*');
if ($prefs instanceof PEAR_Error) {
- Horde::logMessage($prefs, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($prefs, 'ERR');
return;
}
$result = $this->_imsp->set($scope . '.' . $name, $value);
if ($result instanceof PEAR_Error) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return;
}
$this->_imsp = Net_IMSP::factory('Options', $this->_params);
$result = $this->_imsp->init();
if ($result instanceof PEAR_Error) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
throw new Horde_Exception_Prior($result);
}
$shares = Horde_Share::singleton('h-prefs');
$default = $shares->getDefaultShare();
if ($default instanceof PEAR_Error) {
- Horde::logMessage($default, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($default, 'ERR');
throw new Horde_Exception_Prior($default);
}
$this->_share = $default->getName();
require_once 'Horde/Kolab.php';
$connection = new Kolab('h-prefs');
if ($connection instanceof PEAR_Error) {
- Horde::logMessage($connection, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($connection, 'ERR');
throw new Horde_Exception_Prior($connection);
}
$result = $this->_connection->open($this->_share, 1);
if ($result instanceof PEAR_Error) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
throw new Horde_Exception_Prior($result);
}
$prefs = $this->_connection->getObjects();
if ($prefs instanceof PEAR_Error) {
- Horde::logMessage($prefs, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($prefs, 'ERR');
throw new Horde_Exception_Prior($prefs);
}
$result = $this->_connection->_storage->save($object, $old_uid);
if ($result instanceof PEAR_Error) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return;
}
}
if (!$conn) {
Horde::logMessage(
sprintf('Failed to open an LDAP connection to %s.',
- $this->_params['hostspec']),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ $this->_params['hostspec']), 'ERR');
throw new Horde_Exception('Internal LDAP error. Details have been logged for the administrator.');
}
sprintf('Set LDAP protocol version to %d failed: [%d] %s',
$this->_params['version'],
@ldap_errno($conn),
- @ldap_error($conn)),
- __FILE__, __LINE__, PEAR_LOG_WARNING);
+ @ldap_error($conn)), 'WARN');
throw new Horde_Exception('Internal LDAP error. Details have been logged for the administrator.');
}
}
Horde::logMessage(
sprintf('STARTTLS failed: [%d] %s',
@ldap_errno($this->_ds),
- @ldap_error($this->_ds)),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ @ldap_error($this->_ds)), 'ERR');
}
}
$this->_params['port'],
$this->_params['searchdn'],
@ldap_errno($conn),
- @ldap_error($conn)),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ @ldap_error($conn)), 'ERR');
throw new Horde_Exception('Internal LDAP error. Details have been logged for the administrator.', @ldap_errno($conn));
}
}
Horde::logMessage(
sprintf('Setting referral callback failed: [%d] %s',
@ldap_errno($conn),
- @ldap_error($conn)),
- __FILE__, __LINE__, PEAR_LOG_WARNING);
+ @ldap_error($conn)), 'WARN');
throw new Horde_Exception(_("Internal LDAP error. Details have been logged for the administrator."), @ldap_errno($conn));
}
}
Horde::logMessage(
sprintf('Error while searching the directory for the user\'s DN: [%d]: %s',
@ldap_errno($this->_connection),
- @ldap_error($this->_connection)),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ @ldap_error($this->_connection)), 'ERR');
throw new Horde_Exception('Internal LDAP error. Details have been logged for the administrator.', @ldap_errno($conn));
}
Horde::logMessage(
sprintf('Error while retrieving LDAP search results for the user\'s DN: [%d]: %s',
@ldap_errno($this->_connection),
- @ldap_error($this->_connection)),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ @ldap_error($this->_connection)), 'ERR');
throw new Horde_Exception('Internal LDAP error. Details have been logged for the administrator.', @ldap_errno($this->_connection));
}
if ($result['count'] != 1) {
Horde::logMessage(
- 'Zero or more than one DN returned from search; unable to determine user\'s correct DN.',
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ 'Zero or more than one DN returned from search; unable to determine user\'s correct DN.', 'ERR');
throw new Horde_Exception('Internal LDAP error. Details have been logged for the administrator.');
}
$this->_dn = $result[0]['dn'];
Horde::logMessage(
sprintf('Error rebinding for prefs writing: [%d]: %s',
@ldap_errno($this->_connection),
- @ldap_error($this->_connection)),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ @ldap_error($this->_connection)), 'ERR');
throw new Horde_Exception('Internal LDAP error. Details have been logged for the administrator.', @ldap_errno($this->_connection));
}
if (strpos($this->_params['hostspec'], $who) === false) {
Horde::logMessage(
sprintf('Referral target %s for DN %s is not in the authorized server list.',
- $who, $bind_dn),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ $who, $bind_dn), 'ERR');
return 1;
}
$this->_params['port'],
$bind_dn,
@ldap_errno($this->_connection),
- @ldap_error($this->_connection)),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ @ldap_error($this->_connection)), 'ERR');
}
return 0;
Horde::logMessage(
sprintf('Error while searching for the user\'s prefs: [%d]: %s',
@ldap_errno($this->_connection),
- @ldap_error($this->_connection)),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ @ldap_error($this->_connection)), 'ERR');
return;
}
Horde::logMessage(
sprintf('Error while retrieving LDAP search results for the user\'s prefs: [%d]: %s',
@ldap_errno($this->_connection),
- @ldap_error($this->_connection)),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ @ldap_error($this->_connection)), 'ERR');
return;
}
Horde::logMessage(
sprintf('Error searching the directory for required objectClasses: [%d] %s',
@ldap_errno($this->_connection),
- @ldap_error($this->_connection)),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ @ldap_error($this->_connection)), 'ERR');
return;
}
Horde::logMessage(
sprintf('Error retrieving results while checking for required objectClasses: [%d] %s',
@ldap_errno($this->_connection),
- @ldap_error($this->_connection)),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ @ldap_error($this->_connection)), 'ERR');
return;
}
Horde::logMessage(
sprintf('Unable to modify user\'s objectClass for preferences: [%d] %s',
@ldap_errno($this->_connection),
- @ldap_error($this->_connection)),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ @ldap_error($this->_connection)), 'ERR');
return;
}
Horde::logMessage(
sprintf('Error while getting preferenes from LDAP: [%d] %s',
@ldap_errno($this->_connection),
- @ldap_error($this->_connection)),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ @ldap_error($this->_connection)), 'ERR');
return;
}
Horde::logMessage(
sprintf('Error while retrieving results from LDAP: [%d] %s',
@ldap_errno($this->_connection),
- @ldap_error($this->_connection)),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ @ldap_error($this->_connection)), 'ERR');
return;
}
Horde::logMessage(
sprintf('Unable to clear user\'s preferences: [%d] %s',
@ldap_errno($this->_connection),
- @ldap_error($this->_connection)),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ @ldap_error($this->_connection)), 'ERR');
}
$this->cleanup(true);
$values = array($this->_user, $scope);
- Horde::logMessage('SQL Query by Horde_Prefs_Sql::retrieve(): ' . $query . ', values: ' . implode(', ', $values), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by Horde_Prefs_Sql::retrieve(): ' . $query . ', values: ' . implode(', ', $values), 'DEBUG');
$result = $this->_db->query($query, $values);
if ($result instanceof PEAR_Error) {
- Horde::logMessage('No preferences were retrieved.', __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('No preferences were retrieved.', 'DEBUG');
return;
}
$row = $result->fetchRow(DB_FETCHMODE_ASSOC);
if ($row instanceof PEAR_Error) {
- Horde::logMessage($row, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($row, 'ERR');
return;
}
$query = 'SELECT 1 FROM ' . $this->_params['table'] .
' WHERE pref_uid = ? AND pref_name = ?' .
' AND pref_scope = ?';
- Horde::logMessage('SQL Query by Horde_Prefs_Sql::store(): ' . $query . ', values: ' . implode(', ', $values), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by Horde_Prefs_Sql::store(): ' . $query . ', values: ' . implode(', ', $values), 'DEBUG');
$check = $this->_write_db->getOne($query, $values);
if ($check instanceof PEAR_Error) {
- Horde::logMessage('Failed checking prefs for ' . $this->_user . ': ' . $check->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage('Failed checking prefs for ' . $this->_user . ': ' . $check->getMessage(), 'ERR');
return;
}
$value);
}
- Horde::logMessage('SQL Query by Horde_Prefs_Sql::store(): ' . $query . ', values: ' . implode(', ', $values), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by Horde_Prefs_Sql::store(): ' . $query . ', values: ' . implode(', ', $values), 'DEBUG');
$result = $this->_write_db->query($query, $values);
if ($result instanceof PEAR_Error) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return;
}
$values = array($this->_user);
- Horde::logMessage('SQL Query by Horde_Prefs_Sql::clear():' . $query . ', values: ' . implode(', ', $values), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by Horde_Prefs_Sql::clear():' . $query . ', values: ' . implode(', ', $values), 'DEBUG');
// Execute the query.
$this->_write_db->query($query, $values);
array('persistent' => !empty($this->_params['persistent']),
'ssl' => !empty($this->_params['ssl'])));
if ($this->_write_db instanceof PEAR_Error) {
- Horde::logMessage($this->_write_db, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($this->_write_db, 'ERR');
throw new Horde_Exception_Prior($this->_write_db);
}
array('persistent' => !empty($params['persistent']),
'ssl' => !empty($params['ssl'])));
if ($this->_db instanceof PEAR_Error) {
- Horde::logMessage($this->_db, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($this->_db, 'ERR');
throw new Horde_Exception_Prior($this->_db);
}
$method = str_replace('.', '/', 'phpgw.' . $method);
if (!$registry->hasMethod($method)) {
- Horde::logMessage(sprintf(_("Method \"%s\" is not defined"), $method), __FILE__, __LINE__, PEAR_LOG_NOTICE);
+ Horde::logMessage(sprintf(_("Method \"%s\" is not defined"), $method), 'NOTICE');
return sprintf(_("Method \"%s\" is not defined"), $method);
}
// Try to resume a session
if (isset($params[0]['kp3']) && $params[0]["kp3"] == session_name() && session_id() != $params[0]["sessionid"]) {
- Horde::logMessage("manually reload session ".$params[0]["sessionid"], __FILE__, __LINE__, PEAR_LOG_NOTICE);
+ Horde::logMessage("manually reload session ".$params[0]["sessionid"], 'NOTICE');
session_regenerate_id();
session_unset();
session_id($params[0]["sessionid"]);
$authenticated = Horde_Auth::isAuthenticated() || $method== "phpgw/system/login";
if ($authenticated) {
- Horde::logMessage("rpc call $method allowed", __FILE__, __LINE__, PEAR_LOG_NOTICE);
+ Horde::logMessage("rpc call $method allowed", 'NOTICE');
return $registry->call($method, $params);
} else {
return PEAR::raiseError(_("You did not authenticate."), 'horde.error');
$GLOBALS['__horde_rpc_PhpSoap']['lastMethodParams'])),
Horde_Auth::getAuth(),
time() - $beginTime,
- ob_get_length()),
- __FILE__, __LINE__, PEAR_LOG_INFO
+ ob_get_length()), 'INFO');
);
return ob_get_clean();
}
/* Log all (wb)xml packets received or sent to debug_dir. */
'debug_files' => true,
/* Log everything. */
- 'log_level' => PEAR_LOG_DEBUG);
+ 'log_level' => 'DEBUG');
/* Create the backend. */
$GLOBALS['backend'] = SyncML_Backend::factory('Horde', $backendparms);
try {
$GLOBALS['registry']->callByPackage($pieces[0], 'put', array('path' => $path, 'content' => $content, 'type' => $options['content_type']));
} catch (Horde_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
if ($e->getCode()) {
return $this->_checkHTTPCode($e->getCode()) . ' ' . $result->getMessage();
}
$pieces = explode('/', trim($this->path, '/'), 2);
if (count($pieces) != 2) {
- Horde::logMessage(sprintf(_("Error deleting from path %s; must be [app]/[path]", $options['path'])), __FILE__, __LINE__, PEAR_LOG_INFO);
+ Horde::logMessage(sprintf(_("Error deleting from path %s; must be [app]/[path]", $options['path'])), 'INFO');
return '403 Must supply a resource within the application to delete.';
}
try {
$GLOBALS['registry']->callByPackage($app, 'path_delete', array($path));
} catch (Horde_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_INFO);
+ Horde::logMessage($e, 'INFO');
if ($e->getCode()) {
return $this->_checkHTTPCode($e->getCode()) . ' ' . $e->getMessage();
}
// Take the module name from the path
$pieces = explode('/', $path, 2);
if (count($pieces) != 2) {
- Horde::logMessage(sprintf(_("Unable to create directory %s; must be [app]/[path]"), $path), __FILE__, __LINE__, PEAR_LOG_INFO);
+ Horde::logMessage(sprintf(_("Unable to create directory %s; must be [app]/[path]"), $path), 'INFO');
return '403 Must specify a resource within an application. MKCOL disallowed at top level.';
}
try {
$GLOBALS['registry']->callByPackage($pieces[0], 'mkcol', array('path' => $path));
} catch (Horde_Exception $e) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
if ($e->getCode()) {
return $this->_checkHTTPCode($e->getCode()) . ' ' . $e->getMessage();
}
// Take the module name from the path
$sourcePieces = explode('/', $path, 2);
if (count($sourcePieces) != 2) {
- Horde::logMessage(sprintf(_("Unable to rename %s; must be [app]/[path] and within the same application."), $path), __FILE__, __LINE__, PEAR_LOG_INFO);
+ Horde::logMessage(sprintf(_("Unable to rename %s; must be [app]/[path] and within the same application."), $path), 'INFO');
return '403 Must specify a resource within an application. MOVE disallowed at top level.';
}
try {
$GLOBALS['registry']->callByPackage($sourcePieces[0], 'move', array('path' => $path, 'dest' => $options['dest']));
} catch (Horde_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
if ($e->getCode()) {
return $this->_checkHTTPCode($e->getCode()) . ' ' . $e->getMessage();
}
$apps = $registry->listApps(null, false, Horde_Perms::READ);
if (is_a($apps, 'PEAR_Error')) {
- Horde::logMessage($apps, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($apps, 'ERR');
return $apps;
}
foreach ($apps as $app) {
try {
$items = $registry->callByPackage($pieces[0], 'browse', array('path' => $path, 'properties' => array('name', 'browseable', 'contenttype', 'contentlength', 'created', 'modified')));
} catch (Horde_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
return $e;
}
}
if (empty($params['path'])) {
- Horde::logMessage('Empty path supplied to LOCK()', __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage('Empty path supplied to LOCK()', 'ERR');
return 403;
}
if ($params['path'] == '/') {
try {
$locks = Horde_Lock::singleton($GLOBALS['conf']['lock']['driver']);
} catch (Horde_Lock_Exception $e) {
- Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e->getMessage(), 'ERR');
return 500;
}
$lockid = $locks->setLock(Horde_Auth::getAuth(), 'webdav', $params['path'],
$timeout, $locktype);
} catch (Horde_Lock_Exception $e) {
- Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e->getMessage(), 'ERR');
return 500;
}
if ($lockid === false) {
try {
$locks = Horde_Lock::singleton($GLOBALS['conf']['lock']['driver']);
} catch (Horde_Lock_Exception $e) {
- Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e->getMessage(), 'ERR');
return 500;
}
try {
$res = $locks->clearLock($params['token']);
} catch (Horde_Lock_Exception $e) {
- Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e->getMessage(), 'ERR');
return 500;
}
if ($res === false) {
- Horde::logMessage('clearLock() returned false', __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage('clearLock() returned false', 'ERR');
// Something else has failed: 424 (Method Failure)
return 424;
}
{
if (!isset($GLOBALS['conf']['lock']['driver']) ||
$GLOBALS['conf']['lock']['driver'] == 'none') {
- Horde::logMessage('WebDAV locking failed because no lock driver has been configured.', __FILE__, __LINE__, PEAR_LOG_WARNING);
+ Horde::logMessage('WebDAV locking failed because no lock driver has been configured.', 'WARN');
return false;
}
try {
$locks = Horde_Lock::singleton($GLOBALS['conf']['lock']['driver']);
} catch (Horde_Lock_Exception $e) {
- Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e->getMessage(), 'ERR');
return false;
}
try {
$res = $locks->getLocks('webdav', $resource);
} catch (Horde_Lock_Exception $e) {
- Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e->getMessage(), 'ERR');
return false;
}
}
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('SQL Query by Horde_SQL::insertBlob(): query = "%s"', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('SQL Query by Horde_SQL::insertBlob(): query = "%s"', $query), 'DEBUG');
/* Execute the query. */
return $this->_db->query($query, $values);
}
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('SQL Query by Horde_SQL::updateBlob(): query = "%s"', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('SQL Query by Horde_SQL::updateBlob(): query = "%s"', $query), 'DEBUG');
/* Execute the query. */
return $dbh->query($query, $values);
$vfs->writeData('.horde/scheduler', Horde_String::lower(get_class($this)) . $id, serialize($this), true);
return true;
} catch (VFS_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
return false;
}
}
$scheduler = $tmp;
}
} catch (VFS_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
}
if ($autosave) {
*/
public function runcmd(&$task)
{
- Horde::logMessage('runcmd(): ' . $task['cmd'] . ' run by ' . $task['uid'], __FILE__, __LINE__, PEAR_LOG_INFO);
+ Horde::logMessage('runcmd(): ' . $task['cmd'] . ' run by ' . $task['uid'], 'INFO');
return shell_exec($task['cmd']);
}
try {
$this->_open($save_path, $session_name);
} catch (Horde_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
return false;
}
try {
$this->_close();
} catch (Horde_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
return false;
}
public function write($id, $session_data)
{
if (!$this->_force && ($this->_sig == md5($session_data))) {
- Horde::logMessage('Session data unchanged (id = ' . $id . ')', __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Session data unchanged (id = ' . $id . ')', 'DEBUG');
return true;
}
}
if ($result === false) {
- Horde::logMessage('Error retrieving session data (id = ' . $id . ')', __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Error retrieving session data (id = ' . $id . ')', 'DEBUG');
return false;
}
$this->_id = $id;
}
- Horde::logMessage('Read session data (id = ' . $id . ')', __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Read session data (id = ' . $id . ')', 'DEBUG');
return $result;
}
if (!$res &&
!$this->_memcache->set($id, $session_data)) {
- Horde::logMessage('Error writing session data (id = ' . $id . ')', __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage('Error writing session data (id = ' . $id . ')', 'ERR');
return false;
}
$this->_memcache->unlock($this->_trackID);
}
- Horde::logMessage('Wrote session data (id = ' . $id . ')', __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Wrote session data (id = ' . $id . ')', 'DEBUG');
return true;
}
$this->_memcache->unlock($id);
if ($result === false) {
- Horde::logMessage('Failed to delete session (id = ' . $id . ')', __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Failed to delete session (id = ' . $id . ')', 'DEBUG');
return false;
}
$this->_memcache->unlock($this->_trackID);
}
- Horde::logMessage('Deleted session data (id = ' . $id . ')', __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Deleted session data (id = ' . $id . ')', 'DEBUG');
return true;
}
}
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Mysql::_read(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Mysql::_read(): query = "%s"', $query), 'DEBUG');
$result = @mysql_query($query, $this->_db);
if (!$result) {
- Horde::logMessage('Error retrieving session data (id = ' . $id . '): ' . mysql_error($this->_db), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage('Error retrieving session data (id = ' . $id . '): ' . mysql_error($this->_db), 'ERR');
return '';
}
}
if (!$result) {
@mysql_query('ROLLBACK', $this->_db);
- Horde::logMessage('Error writing session data: ' . $error, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage('Error writing session data: ' . $error, 'ERR');
return false;
}
$this->_params['table'], $this->_quote($id));
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Mysql::destroy(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Mysql::destroy(): query = "%s"', $query), 'DEBUG');
/* Execute the query. */
$result = @mysql_query($query, $this->_db);
}
if (!$result) {
@mysql_query('ROLLBACK', $this->_db);
- Horde::logMessage('Failed to delete session (id = ' . $id . '): ' . $error, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage('Failed to delete session (id = ' . $id . '): ' . $error, 'ERR');
return false;
}
$this->_params['table'], (int)(time() - $maxlifetime));
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Mysql::gc(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Mysql::gc(): query = "%s"', $query), 'DEBUG');
/* Execute the query. */
$result = @mysql_query($query, $this->_db);
if (!$result) {
- Horde::logMessage('Error garbage collecting old sessions: ' . mysql_error($this->_db), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage('Error garbage collecting old sessions: ' . mysql_error($this->_db), 'ERR');
return false;
}
time() - ini_get('session.gc_maxlifetime'));
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Mysql::getSessionIDs(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Mysql::getSessionIDs(): query = "%s"', $query), 'DEBUG');
$result = @mysql_query($query, $this->_db);
if (!$result) {
$file = session_save_path() . DIRECTORY_SEPARATOR . 'sess_' . $id;
$session_data = @file_get_contents($file);
if ($session_data === false) {
- Horde::logMessage('Unable to read file: ' . $file, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage('Unable to read file: ' . $file, 'ERR');
$session_data = '';
}
$select_query = sprintf('SELECT session_data FROM %s WHERE session_id = %s FOR UPDATE',
$this->_params['table'], $this->_quote($id));
- Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Oci8::_read(): query = "%s"', $select_query), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Oci8::_read(): query = "%s"', $select_query), 'DEBUG');
$select_statement = OCIParse($this->_db, $select_query);
OCIExecute($select_statement, OCI_DEFAULT);
$select_query = sprintf('SELECT session_data FROM %s WHERE session_id = %s FOR UPDATE',
$this->_params['table'], $this->_quote($id));
- Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Oci8::_write(): query = "%s"', $select_query), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Oci8::_write(): query = "%s"', $select_query), 'DEBUG');
$select_statement = OCIParse($this->_db, $select_query);
OCIExecute($select_statement, OCI_DEFAULT);
$this->_quote($id),
$this->_quote(time()));
- Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Oci8::_read(): query = "%s"', $insert_query), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Oci8::_read(): query = "%s"', $insert_query), 'DEBUG');
$insert_statement = OCIParse($this->_db, $insert_query);
$lob = OCINewDescriptor($this->_db);
$this->_params['table'], $this->_quote($id));
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Oci8::destroy(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Oci8::destroy(): query = "%s"', $query), 'DEBUG');
/* Execute the query. */
$statement = OCIParse($this->_db, $query);
$result = OCIExecute($statement);
if (!$result) {
OCIFreeStatement($statement);
- Horde::logMessage('Failed to delete session (id = ' . $id . ')', __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage('Failed to delete session (id = ' . $id . ')', 'ERR');
return false;
}
$this->_params['table'], $this->_quote(time() - $maxlifetime));
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Oci8::gc(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Oci8::gc(): query = "%s"', $query), 'DEBUG');
/* Execute the query. */
$statement = OCIParse($this->_db, $query);
$result = OCIExecute($statement);
if (!$result) {
OCIFreeStatement($statement);
- Horde::logMessage('Error garbage collecting old sessions', __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage('Error garbage collecting old sessions', 'ERR');
return false;
}
time() - ini_get('session.gc_maxlifetime'));
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Oci8::getSessionIDs(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Oci8::getSessionIDs(): query = "%s"', $query), 'DEBUG');
/* Execute query */
$statement = OCIParse($this->_db, $query);
$this->_quote($id));
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Pgsql::' . '_read(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Pgsql::' . '_read(): query = "%s"', $query), 'DEBUG');
$result = @pg_query($this->_db, $query);
$data = pg_fetch_result($result, 0, 'session_data');
}
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Pgsql::' . '_write(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Pgsql::' . '_write(): query = "%s"', $query), 'DEBUG');
$result = @pg_query($this->_db, $query);
$rows = pg_affected_rows($result);
@pg_query($this->_db, 'COMMIT;');
if ($rows != 1) {
- Horde::logMessage('Error writing session data', __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage('Error writing session data', 'ERR');
return false;
}
$this->_params['table'], $this->_quote($id));
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Pgsql::' . 'destroy(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Pgsql::' . 'destroy(): query = "%s"', $query), 'DEBUG');
/* Execute the query. */
$result = @pg_query($this->_db, $query);
if (!$result) {
pg_free_result($result);
- Horde::logMessage('Failed to delete session (id = ' . $id . ')', __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage('Failed to delete session (id = ' . $id . ')', 'ERR');
return false;
}
$this->_quote(time() - $maxlifetime));
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Pgsql::' . 'gc(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Pgsql::' . 'gc(): query = "%s"', $query), 'DEBUG');
/* Execute the query. */
$result = @pg_query($this->_db, $query);
if (!$result) {
- Horde::logMessage('Error garbage collecting old sessions', __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage('Error garbage collecting old sessions', 'ERR');
}
pg_free_result($result);
time() - ini_get('session.gc_maxlifetime'));
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Pgsql::' . 'getSessionIDs(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Pgsql::' . 'getSessionIDs(): query = "%s"', $query), 'DEBUG');
/* Execute the query. */
$result = @pg_query($this->_db, $query);
/* Begin a transaction. */
$result = $this->_write_db->autocommit(false);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return '';
}
$result = Horde_SQL::readBlob($this->_write_db, $this->_params['table'], 'session_data', array('session_id' => $id));
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return '';
}
$values = array($id);
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Sql::write(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Sql::write(): query = "%s"', $query), 'DEBUG');
/* Execute the query. */
$result = $this->_write_db->getOne($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return false;
}
if (is_a($result, 'PEAR_Error')) {
$this->_write_db->rollback();
$this->_write_db->autoCommit(true);
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return false;
}
$result = $this->_write_db->commit();
if (is_a($result, 'PEAR_Error')) {
$this->_write_db->autoCommit(true);
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return false;
}
$values = array($id);
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Sql::destroy(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Sql::destroy(): query = "%s"', $query), 'DEBUG');
/* Execute the query. */
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return false;
}
$result = $this->_write_db->commit();
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return false;
}
$values = array(time() - $maxlifetime);
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Sql::gc(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Sql::gc(): query = "%s"', $query), 'DEBUG');
/* Execute the query. */
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return false;
}
$values = array(time() - ini_get('session.gc_maxlifetime'));
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Sql::getSessionIDs(): query = "%s"', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('SQL Query by Horde_SessionHandler_Sql::getSessionIDs(): query = "%s"', $query), 'DEBUG');
/* Execute the query. */
$result = $this->_db->getCol($query, 0, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return false;
}
function getPermissions($share, $user = null)
{
if (is_a($share, 'PEAR_Error')) {
- Horde::logMessage($share, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($share, 'ERR');
return false;
}
if (!is_a($share, 'Horde_Share_Object')) {
$share = $this->getShare($share);
if (is_a($share, 'PEAR_Error')) {
- Horde::logMessage($share, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($share, 'ERR');
return false;
}
}
$locks = &Horde_Lock::singleton($GLOBALS['conf']['lock']['driver']);
} catch (Horde_Lock_Exception $e) {
$locks = PEAR::raiseError($e->getMessage());
- Horde::logMessage($locks, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($locks, 'ERR');
return $locks;
}
$locks = &Horde_Lock::singleton($GLOBALS['conf']['lock']['driver']);
} catch (Horde_Lock_Exception $e) {
$locks = PEAR::raiseError($e->getMessage());
- Horde::logMessage($locks, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($locks, 'ERR');
return $locks;
}
$locks = &Horde_Lock::singleton($GLOBALS['conf']['lock']['driver']);
} catch (Horde_Lock_Exception $e) {
$locks = PEAR::raiseError($e->getMessage());
- Horde::logMessage($locks, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($locks, 'ERR');
return $locks;
}
$result = $locks->getLocks($this->_shareOb->getApp(), $shareid, $locktype);
} catch (Horde_Lock_Exception $e) {
$result = PEAR::raiseError($e->getMessage());
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$result = $locks->getLocks($this->_shareOb->getApp() . ':' . $shareid, $item_uid, $locktype);
} catch (Horde_Lock_Exception $e) {
$result = PEAR::raiseError($e->getMessage());
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
} else {
if ($this->_hasUsers($share)) {
$stmt = $this->_db->prepare('SELECT user_uid, perm FROM ' . $this->_table . '_users WHERE share_id = ?');
if (is_a($stmt, 'PEAR_Error')) {
- Horde::logMessage($stmt, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($stmt, 'ERR');
return $stmt;
}
$result = $stmt->execute(array($share['share_id']));
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
} elseif (!empty($result)) {
while ($row = $result->fetchRow(MDB2_FETCHMODE_ASSOC)) {
// Get groups permissions
$stmt = $this->_db->prepare('SELECT group_uid, perm FROM ' . $this->_table . '_groups WHERE share_id = ?');
if (is_a($stmt, 'PEAR_Error')) {
- Horde::logMessage($stmt, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($stmt, 'ERR');
return $stmt;
}
$result = $stmt->execute(array($share['share_id']));
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
} elseif (!empty($result)) {
while ($row = $result->fetchRow(MDB2_FETCHMODE_ASSOC)) {
{
$stmt = $this->_db->prepare('SELECT * FROM ' . $this->_table . ' WHERE share_name = ?');
if (is_a($stmt, 'PEAR_Error')) {
- Horde::logMessage($stmt, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($stmt, 'ERR');
return $stmt;
}
$results = $stmt->execute(array($name));
if (is_a($results, 'PEAR_Error')) {
- Horde::logMessage($results, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($results, 'ERR');
return $results;
}
$data = $results->fetchRow(MDB2_FETCHMODE_ASSOC);
if (is_a($data, 'PEAR_Error')) {
- Horde::logMessage($data, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($data, 'ERR');
return $data;
} elseif (empty($data)) {
return PEAR::RaiseError(sprintf(_("Share \"%s\" does not exist."), $name));
$params = array($id);
$stmt = $this->_db->prepare('SELECT * FROM ' . $this->_table . ' WHERE share_id = ?');
if (is_a($stmt, 'PEAR_Error')) {
- Horde::logMessage($stmt, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($stmt, 'ERR');
return $stmt;
}
$results = $stmt->execute($params);
if (is_a($results, 'PEAR_Error')) {
- Horde::logMessage($results, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($results, 'ERR');
return $results;
}
$data = $results->fetchRow(MDB2_FETCHMODE_ASSOC);
if (is_a($data, 'PEAR_Error')) {
- Horde::logMessage($data, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($data, 'ERR');
return $data;
} elseif (empty($data)) {
return PEAR::RaiseError(sprintf(_("Share ID %d does not exist."), $id));
$query = 'SELECT * FROM ' . $this->_table . ' WHERE share_id IN (' . implode(', ', $ids) . ')';
$result = $this->_db->query($query);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
} elseif (empty($result)) {
return array();
. ' WHERE share_id IN (' . implode(', ', $users) . ')';
$result = $this->_db->query($query);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
} elseif (!empty($result)) {
while ($share = $result->fetchRow(MDB2_FETCHMODE_ASSOC)) {
. ' WHERE share_id IN (' . implode(', ', $groups) . ')';
$result = $this->_db->query($query);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
} elseif (!empty($result)) {
while ($share = $result->fetchRow(MDB2_FETCHMODE_ASSOC)) {
$query = 'SELECT * FROM ' . $this->_table . ' ORDER BY share_name ASC';
$result = $this->_db->query($query);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
} elseif (empty($result)) {
return array();
$query = 'SELECT share_id, user_uid, perm FROM ' . $this->_table . '_users';
$result = $this->_db->query($query);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
} elseif (!empty($result)) {
while ($share = $result->fetchRow(MDB2_FETCHMODE_ASSOC)) {
$query = 'SELECT share_id, group_uid, perm FROM ' . $this->_table . '_groups';
$result = $this->_db->query($query);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
} elseif (!empty($result)) {
while ($share = $result->fetchRow(MDB2_FETCHMODE_ASSOC)) {
@sqlite_query('PRAGMA short_column_names=1', $connection);
}
- Horde::logMessage(sprintf("SQL Query by Horde_Share_sql::listShares: %s", $query), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf("SQL Query by Horde_Share_sql::listShares: %s", $query), 'DEBUG');
$result = $this->_db->query($query);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
} elseif (empty($result)) {
return array();
. ')';
$result = $this->_db->query($query);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
} elseif (!empty($result)) {
while ($share = $result->fetchRow(MDB2_FETCHMODE_ASSOC)) {
. ')';
$result = $this->_db->query($query);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
} elseif (!empty($result)) {
while ($share = $result->fetchRow(MDB2_FETCHMODE_ASSOC)) {
}
$query = 'SELECT * FROM ' . $this->_table . ' WHERE share_owner IS NULL';
- Horde::logMessage('SQL Query by Horde_Share_sql::listSystemShares: ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by Horde_Share_sql::listSystemShares: ' . $query, 'DEBUG');
$result = $this->_db->query($query);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
} elseif (empty($result)) {
return array();
{
$query = $this->_getShareCriteria($userid, $perm, $attributes);
$query = 'SELECT COUNT(DISTINCT s.share_id) ' . $query;
- Horde::logMessage(sprintf("SQL Query by Horde_Share_sql::_countShares: %s", $query), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf("SQL Query by Horde_Share_sql::_countShares: %s", $query), 'DEBUG');
return $this->_db->queryOne($query);
}
/* Remove the share entry */
$stmt = $this->_write_db->prepare('DELETE FROM ' . $table . ' WHERE share_id = ?', null, MDB2_PREPARE_MANIP);
if (is_a($stmt, 'PEAR_Error')) {
- Horde::logMessage($stmt, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($stmt, 'ERR');
return $stmt;
}
$result = $stmt->execute($params);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$stmt->free();
. ' WHERE share_name = ?');
if (is_a($stmt, 'PEAR_Error')) {
- Horde::logMessage($stmt, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($stmt, 'ERR');
return $stmt;
}
$result = $stmt->execute(array($share));
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$where .= ' OR (g.group_uid IN (' . implode(',', $group_ids) . ')'
. ' AND (' . Horde_SQL::buildClause($this->_db, 'g.perm', '&', $perm) . '))';
} elseif (is_a($groups, 'PEAR_Error')) {
- Horde::logMessage($groups, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($groups, 'ERR');
}
} else {
$where = '(' . Horde_SQL::buildClause($this->_db, 's.perm_guest', '&', $perm) . ')';
if (empty($this->data['share_id'])) {
$share_id = $db->nextId($table);
if (is_a($share_id, 'PEAR_Error')) {
- Horde::logMessage($share_id, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($share_id, 'ERR');
return $share_id;
}
}
$stmt = $db->prepare($query, null, MDB2_PREPARE_MANIP);
if (is_a($stmt, 'PEAR_Error')) {
- Horde::logMessage($stmt, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($stmt, 'ERR');
return $stmt;
}
$result = $stmt->execute($params);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$stmt->free();
// Update the share's user permissions
$stmt = $db->prepare('DELETE FROM ' . $table . '_users WHERE share_id = ?', null, MDB2_PREPARE_MANIP);
if (is_a($stmt, 'PEAR_Error')) {
- Horde::logMessage($stmt, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($stmt, 'ERR');
return $stmt;
}
$result = $stmt->execute(array($this->data['share_id']));
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$stmt->free();
foreach ($this->data['perm']['users'] as $user => $perm) {
$stmt = $db->prepare('INSERT INTO ' . $table . '_users (share_id, user_uid, perm) VALUES (?, ?, ?)', null, MDB2_PREPARE_MANIP);
if (is_a($stmt, 'PEAR_Error')) {
- Horde::logMessage($stmt, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($stmt, 'ERR');
return $stmt;
}
$result = $stmt->execute(array($this->data['share_id'], $user, $perm));
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$stmt->free();
// Update the share's group permissions
$stmt = $db->prepare('DELETE FROM ' . $table . '_groups WHERE share_id = ?', null, MDB2_PREPARE_MANIP);
if (is_a($stmt, 'PEAR_Error')) {
- Horde::logMessage($stmt, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($stmt, 'ERR');
return $stmt;
}
$result = $stmt->execute(array($this->data['share_id']));
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$stmt->free();
foreach ($this->data['perm']['groups'] as $group => $perm) {
$stmt = $db->prepare('INSERT INTO ' . $table . '_groups (share_id, group_uid, perm) VALUES (?, ?, ?)', null, MDB2_PREPARE_MANIP);
if (is_a($stmt, 'PEAR_Error')) {
- Horde::logMessage($stmt, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($stmt, 'ERR');
return $stmt;
}
$result = $stmt->execute(array($this->data['share_id'], $group, $perm));
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$stmt->free();
$this->_db->setLimit($count, $from);
}
- Horde::logMessage('Query By Horde_Share_sql_hierarchical: ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Query By Horde_Share_sql_hierarchical: ' . $query, 'DEBUG');
$result = $this->_db->query($query);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
} elseif (empty($result)) {
return array();
. ')';
$result = $this->_db->query($query);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
} elseif (!empty($result)) {
while ($share = $result->fetchRow(MDB2_FETCHMODE_ASSOC)) {
. ')';
$result = $this->_db->query($query);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
} elseif (!empty($result)) {
while ($share = $result->fetchRow(MDB2_FETCHMODE_ASSOC)) {
$allowners = $this->_db->queryCol($sql);
if (is_a($allowners, 'PEAR_Error')) {
- Horde::logMessage($allowners, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($allowners, 'ERR');
return $allowners;
}
$query = 'SELECT * FROM ' . $this->_table . ' WHERE share_id IN (' . implode(', ', $ids) . ')';
$result = $this->_db->query($query);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
} elseif (empty($result)) {
return array();
. ' WHERE share_id IN (' . implode(', ', $users) . ')';
$result = $this->_db->query($query);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
} elseif (!empty($result)) {
while ($share = $result->fetchRow(MDB2_FETCHMODE_ASSOC)) {
. ' WHERE share_id IN (' . implode(', ', $groups) . ')';
$result = $this->_db->query($query);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
} elseif (!empty($result)) {
while ($share = $result->fetchRow(MDB2_FETCHMODE_ASSOC)) {
if (!is_null($parent) && !is_a($parent, 'Horde_Share_Object')) {
$parent = $this->_shareOb->getShareById($parent);
if (is_a($parent, 'PEAR_Error')) {
- Horde::logMessage($parent, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($parent, 'ERR');
return $parent;
}
}
require_once 'SyncML/XMLOutput.php';
require_once 'SyncML/Backend.php';
-/* PEAR_LOG_* constants */
-require_once 'Log.php';
-
class SyncML_ContentHandler {
/**
$s = sprintf('XML error: %s at line %d',
xml_error_string(xml_get_error_code($parser)),
xml_get_current_line_number($parser));
- $GLOBALS['backend']->logMessage($s, __FILE__, __LINE__,
- PEAR_LOG_ERR);
+ $GLOBALS['backend']->logMessage($s, 'ERR');
xml_parser_free($parser);
return new PEAR_Error($s);
}
$errorLogging = ob_get_clean();
if (!empty($errorLogging)) {
- $GLOBALS['backend']->logMessage('Caught output: ' . $errorLogging,
- __FILE__, __LINE__,
- PEAR_LOG_WARNING);
+ $GLOBALS['backend']->logMessage('Caught output: ' . $errorLogging, 'WARN');
}
return $output;
} else {
$statuscode = RESPONSE_INVALID_CREDENTIALS;
}
- $GLOBALS['backend']->logMessage('Invalid authentication',
- __FILE__, __LINE__,
- PEAR_LOG_DEBUG);
+ $GLOBALS['backend']->logMessage('Invalid authentication', 'DEBUG');
}
} else {
$statuscode = RESPONSE_OK;
. '; charset: ' . $GLOBALS['backend']->getCharset()
. '; wbxml: ' . ($state->wbxml ? 'yes' : 'no');
- $GLOBALS['backend']->logMessage($str, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $GLOBALS['backend']->logMessage($str, 'DEBUG');
}
/**
foreach ($p as $pendingSync) {
if (!$messageFull) {
$GLOBALS['backend']->logMessage(
- 'Continuing sync for syncType ' . $pendingSync,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ 'Continuing sync for syncType ' . $pendingSync, 'DEBUG');
$sync = &$state->getSync($pendingSync);
$sync->createSyncOutput($this->_xmlWriter);
}
!$state->hasPendingSyncs()) {
/* Create <Final></Final>. */
$this->_xmlWriter->outputFinal();
- $GLOBALS['backend']->logMessage('Sending <Final> to client',
- __FILE__, __LINE__,
- PEAR_LOG_DEBUG);
+ $GLOBALS['backend']->logMessage('Sending <Final> to client', 'DEBUG');
$state->delayedFinal = false;
} else {
$GLOBALS['message_expectresponse'] = true;
/* Create <Final></Final>. */
$this->_xmlWriter->outputFinal();
$GLOBALS['backend']->logMessage(
- 'Sending delayed <Final> to client',
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ 'Sending delayed <Final> to client', 'DEBUG');
$state->delayedFinal = false;
} else {
$GLOBALS['message_expectresponse'] = true;
foreach ($state->getSyncs() as $sync) {
$sync->closeSync();
}
- $GLOBALS['backend']->logMessage('Session completed and closed',
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $GLOBALS['backend']->logMessage('Session completed and closed', 'DEBUG');
/* Session can be closed here. */
$GLOBALS['backend']->sessionClose();
} else {
- $GLOBALS['backend']->logMessage('Return message completed',
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $GLOBALS['backend']->logMessage('Return message completed', 'DEBUG');
}
}
var $_debugFiles;
/**
- * The log level. One of the PEAR_LOG_* constants.
+ * The log level.
*
- * @see PEAR Log package
* @see SyncML_Backend()
- * @var integer
+ * @var string
*/
- var $_logLevel = PEAR_LOG_INFO;
+ var $_logLevel = 'INFO';
/**
* The charset used in the SyncML messages.
* outgoing packets and data
* conversions and devinf log in
* debug_dir.
- * - log_level: PEAR_LOG_*. Only log entries with
- * at least this level. Defaults to
- * PEAR_LOG_INFO.
+ * - log_level: Only log entries with at least
+ * this level. Defaults to 'INFO'.
*/
function SyncML_Backend($params)
{
$this->_logLevel = $params['log_level'];
}
- $this->logMessage('Backend of class ' . get_class($this) . ' created',
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $this->logMessage('Backend of class ' . get_class($this) . ' created', 'DEBUG');
}
/**
default:
$this->logMessage('Invalid database "' . $database
- . '". Try tasks, calendar, notes or contacts.',
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ . '". Try tasks, calendar, notes or contacts.', 'ERR');
return false;
}
}
switch ($credType) {
case 'syncml:auth-basic':
list($username, $pwd) = explode(':', base64_decode($credData), 2);
- $this->logMessage('Checking authentication for user ' . $username,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $this->logMessage('Checking authentication for user ' . $username, 'DEBUG');
return $this->_checkAuthentication($username, $pwd);
case 'syncml:auth-md5':
return false;
default:
- $this->logMessage('Unsupported authentication type ' . $credType,
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ $this->logMessage('Unsupported authentication type ' . $credType, 'ERR');
return false;
}
}
/**
* Logs a message in the backend.
*
+ * TODO: This should be done via Horde_Log or the equivalent.
+ *
* @param mixed $message Either a string or a PEAR_Error object.
* @param string $file What file was the log function called from
* (e.g. __FILE__)?
* @param integer $line What line was the log function called from
* (e.g. __LINE__)?
* @param integer $priority The priority of the message. One of:
- * - PEAR_LOG_EMERG
- * - PEAR_LOG_ALERT
- * - PEAR_LOG_CRIT
- * - PEAR_LOG_ERR
- * - PEAR_LOG_WARNING
- * - PEAR_LOG_NOTICE
- * - PEAR_LOG_INFO
- * - PEAR_LOG_DEBUG
+ * - EMERG
+ * - ALERT
+ * - CRIT
+ * - ERR
+ * - WARN
+ * - NOTICE
+ * - INFO
+ * - DEBUG
*/
- function logMessage($message, $file, $line, $priority = PEAR_LOG_INFO)
+ function logMessage($message, $priority = 'INFO')
{
- if ($priority > $this->_logLevel) {
+ if (is_string($priority)) {
+ $priority = defined('Horde_Log::' . $priority)
+ ? constant('Horde_Log::' . $priority)
+ : Horde_Log::INFO;
+ }
+
+ if (is_string($this->_logLevel)) {
+ $loglevel = defined('Horde_Log::' . $this->_logLevel)
+ ? constant('Horde_Log::' . $this->_logLevel)
+ : Horde_Log::INFO;
+ } else {
+ $loglevel = $this->_logLevel;
+ }
+
+ if ($priority > $loglevel) {
return;
}
// Internal logging to logtext
if (is_string($this->_logtext)) {
switch ($priority) {
- case PEAR_LOG_EMERG:
+ case 'EMERG':
$this->_logtext .= 'EMERG: ';
break;
- case PEAR_LOG_ALERT:
+ case 'ALERT':
$this->_logtext .= 'ALERT: ';
break;
- case PEAR_LOG_CRIT:
+ case 'CRIT':
$this->_logtext .= 'CIRT: ';
break;
- case PEAR_LOG_ERR:
+ case 'ERR':
$this->_logtext .= 'ERR: ';
break;
- case PEAR_LOG_WARNING:
+ case 'WARNING':
$this->_logtext .= 'WARNING:';
break;
- case PEAR_LOG_NOTICE:
+ case 'NOTICE':
$this->_logtext .= 'NOTICE: ';
break;
- case PEAR_LOG_INFO:
+ case 'INFO':
$this->_logtext .= 'INFO: ';
break;
- case PEAR_LOG_DEBUG:
+ case 'DEBUG':
$this->_logtext .= 'DEBUG: ';
break;
default:
if ($type === SYNCML_LOGFILE_CLIENTMESSAGE) {
$this->logMessage('Started at ' . date('Y-m-d H:i:s')
. '. Packet logged in '
- . $this->_debugDir . '/' . $filename,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ . $this->_debugDir . '/' . $filename, 'DEBUG');
}
/* Increase packet number. */
if ($type === SYNCML_LOGFILE_SERVERMESSAGE) {
$this->logMessage('Finished at ' . date('Y-m-d H:i:s')
. '. Packet logged in '
- . $this->_debugDir . '/' . $filename,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ . $this->_debugDir . '/' . $filename, 'DEBUG');
$fp = @fopen($this->_debugDir . '/packetnum.txt', 'w');
if ($fp) {
$this->_db = DB::connect($GLOBALS['conf']['sql']);
if (is_a($this->_db, 'PEAR_Error')) {
- Horde::logMessage($this->_db, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($this->_db, 'ERR');
}
/* Set DB portability options. */
$start .= '000000';
}
$start = new Horde_Date($start);
- $this->logMessage('Slow-syncing all events starting from ' . (string)$start,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $this->logMessage('Slow-syncing all events starting from ' . (string)$start, 'DEBUG');
$data = $registry->call(
$database . '/list',
array(SyncML_Backend::getParameter($databaseURI, 'source'),
if (is_a($data, 'PEAR_Error')) {
$this->logMessage("$database/list or $database/listBy failed while retrieving server additions:"
- . $data->getMessage(),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ . $data->getMessage(), 'ERR');
return $data;
}
$cuid = $this->_getCuid($database, $suid);
if ($cuid) {
$this->logMessage(
- "Added to server from client during SlowSync: $suid ignored",
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ "Added to server from client during SlowSync: $suid ignored", 'DEBUG');
continue;
}
}
if ($sync_ts && $sync_ts >= $add_ts[$suid]) {
// Change was done by us upon request of client. Don't mirror
// that back to the client.
- $this->logMessage("Added to server from client: $suid ignored",
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $this->logMessage("Added to server from client: $suid ignored", 'DEBUG');
continue;
}
$this->logMessage(
- "Adding to client from db $database, server id $suid",
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ "Adding to client from db $database, server id $suid", 'DEBUG');
$adds[$suid] = 0;
}
if (is_a($data, 'PEAR_Error')) {
$this->logMessage(
"$database/listBy failed while retrieving server modifications:"
- . $data->getMessage(),
- __FILE__, __LINE__, PEAR_LOG_WARNING);
+ . $data->getMessage(), 'WARN');
return $data;
}
if ($sync_ts && $sync_ts >= $mod_ts[$suid]) {
// Change was done by us upon request of client. Don't
// mirror that back to the client.
- $this->logMessage("Changed on server after sent from client: $suid ignored",
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $this->logMessage("Changed on server after sent from client: $suid ignored", 'DEBUG');
continue;
}
$cuid = $this->_getCuid($database, $suid);
if (!$cuid) {
$this->logMessage(
- "Unable to create change for server id $suid: client id not found in map, adding instead.",
- __FILE__, __LINE__, PEAR_LOG_WARNING);
+ "Unable to create change for server id $suid: client id not found in map, adding instead.", 'WARN');
$adds[$suid] = 0;
continue;
} else {
$mods[$suid] = $suid;
}
$this->logMessage(
- "Modifying on client from db $database, client id $cuid -> server id $suid",
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ "Modifying on client from db $database, client id $cuid -> server id $suid", 'DEBUG');
}
// Handle deletions.
if (is_a($data, 'PEAR_Error')) {
$this->logMessage(
"$database/listBy failed while retrieving server deletions:"
- . $data->getMessage(),
- __FILE__, __LINE__, PEAR_LOG_WARNING);
+ . $data->getMessage(), 'WARN');
return $data;
}
if ($sync_ts && $sync_ts >= $suid_ts) {
// Change was done by us upon request of client. Don't
// mirror that back to the client.
- $this->logMessage("Deleted on server after request from client: $suid ignored",
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $this->logMessage("Deleted on server after request from client: $suid ignored", 'DEBUG');
continue;
}
$cuid = $this->_getCuid($database, $suid);
if (!$cuid) {
$this->logMessage(
- "Unable to create delete for server id $suid: client id not found in map",
- __FILE__, __LINE__, PEAR_LOG_WARNING);
+ "Unable to create delete for server id $suid: client id not found in map", 'WARN');
continue;
}
$dels[$suid] = $cuid;
$dels[$suid] = $suid;
}
$this->logMessage(
- "Deleting on client from db $database, client id $cuid -> server id $suid",
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ "Deleting on client from db $database, client id $cuid -> server id $suid", 'DEBUG');
}
return true;
if (!is_a($suid, 'PEAR_Error')) {
$this->logMessage(
- "Added to server db $database client id $cuid -> server id $suid",
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ "Added to server db $database client id $cuid -> server id $suid", 'DEBUG');
$ts = $registry->call(
$database . '/getActionTimestamp',
array($suid,
SyncML_Backend::getParameter($databaseURI, 'source')));
if (!$ts) {
$this->logMessage(
- "Unable to find addition timestamp for server id $suid at $ts"
- , __FILE__, __LINE__, PEAR_LOG_ERR);
+ "Unable to find addition timestamp for server id $suid at $ts", 'ERR');
}
// Only server needs to do a cuid<->suid map
if ($this->_backendMode == SYNCML_BACKENDMODE_SERVER) {
if ($suid->getDebugInfo()) {
$suid = $suid->getDebugInfo();
$this->logMessage(
- 'Adding client entry to server: already exists with server id ' . $suid,
- __FILE__, __LINE__, PEAR_LOG_NOTICE);
+ 'Adding client entry to server: already exists with server id ' . $suid, 'NOTICE');
if ($this->_backendMode == SYNCML_BACKENDMODE_SERVER) {
$this->createUidMap($database, $cuid, $suid, 0);
}
return $ok;
}
$this->logMessage(
- "Replaced in server db $database client id $cuid -> server id $suid",
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ "Replaced in server db $database client id $cuid -> server id $suid", 'DEBUG');
$ts = $registry->call(
$database . '/getActionTimestamp',
array($suid,
}
$this->logMessage(
- "Deleted in server db $database client id $cuid -> server id $suid",
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ "Deleted in server db $database client id $cuid -> server id $suid", 'DEBUG');
$ts = $registry->call($database . '/getActionTimestamp',
array($suid, 'delete'));
// We can't remove the mapping entry as we need to keep the timestamp
$this->logMessage(
'SQL Query by SyncML_Backend_Horde::writeSyncAnchors(): '
- . $query . ', values: ' . implode(', ', $values),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ . $query . ', values: ' . implode(', ', $values), 'DEBUG');
return $this->_db->query($query, $values);
}
$this->logMessage(
'SQL Query by SyncML_Backend_Horde::readSyncAnchors(): '
- . $query . ', values: ' . implode(', ', $values),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ . $query . ', values: ' . implode(', ', $values), 'DEBUG');
$result = $this->_db->getRow($query, $values);
if (is_a($result, 'PEAR_Error')) {
- $this->logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ $this->logMessage($result, 'ERR');
}
return $result;
$this->logMessage(
'SQL Query by SyncML_Backend_Horde::getUserAnchors(): '
- . $query . ', values: ' . implode(', ', $values),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ . $query . ', values: ' . implode(', ', $values), 'DEBUG');
$result = $this->_db->getAssoc($query, false, $values,
DB_FETCHMODE_ASSOC, true);
if (is_a($result, 'PEAR_Error')) {
- $this->logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ $this->logMessage($result, 'ERR');
}
return $result;
$this->logMessage(
'SQL Query by SyncML_Backend_Horde::removeAnchor(): '
- . $query . ', values: ' . implode(', ', $values),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ . $query . ', values: ' . implode(', ', $values), 'DEBUG');
$result = $this->_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- $this->logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ $this->logMessage($result, 'ERR');
}
return $result;
$database, $this->_user, $cuid);
$this->logMessage('SQL Query by SyncML_Backend_Horde::createUidMap(): '
- . $query . ', values: ' . implode(', ', $values),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ . $query . ', values: ' . implode(', ', $values), 'DEBUG');
$result = $this->_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- $this->logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ $this->logMessage($result, 'ERR');
return $result;
}
$values = array($this->_syncDeviceID, $database, $this->_user, $cuid);
$this->logMessage('SQL Query by SyncML_Backend_Horde::_getSuid(): '
- . $query . ', values: ' . implode(', ', $values),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ . $query . ', values: ' . implode(', ', $values), 'DEBUG');
$result = $this->_db->getOne($query, $values);
if (is_a($result, 'PEAR_Error')) {
- $this->logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ $this->logMessage($result, 'ERR');
}
return $result;
$values = array($this->_syncDeviceID, $database, $this->_user, $suid);
$this->logMessage('SQL Query by SyncML_Backend_Horde::_getCuid(): '
- . $query . ', values: ' . implode(', ', $values),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ . $query . ', values: ' . implode(', ', $values), 'DEBUG');
$result = $this->_db->getOne($query, $values);
if (is_a($result, 'PEAR_Error')) {
- $this->logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ $this->logMessage($result, 'ERR');
}
return $result;
$values = array($this->_syncDeviceID, $database, $this->_user, $suid);
$this->logMessage('SQL Query by SyncML_Backend_Horde::_getChangeTS(): '
- . $query . ', values: ' . implode(', ', $values),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ . $query . ', values: ' . implode(', ', $values), 'DEBUG');
$result = $this->_db->getOne($query, $values);
if (is_a($result, 'PEAR_Error')) {
- $this->logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ $this->logMessage($result, 'ERR');
}
return $result;
$values = array($this->_syncDeviceID, $database, $this->_user);
$this->logMessage('SQL Query by SyncML_Backend_Horde::eraseMap(): '
- . $query . ', values: ' . implode(', ', $values),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ . $query . ', values: ' . implode(', ', $values), 'DEBUG');
$result = $this->_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- $this->logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ $this->logMessage($result, 'ERR');
}
return $result;
/**
* Logs a message in the backend.
*
- * @param mixed $message Either a string or a PEAR_Error object.
- * @param string $file What file was the log function called from
- * (e.g. __FILE__)?
- * @param integer $line What line was the log function called from
- * (e.g. __LINE__)?
- * @param integer $priority The priority of the message. One of:
- * - PEAR_LOG_EMERG
- * - PEAR_LOG_ALERT
- * - PEAR_LOG_CRIT
- * - PEAR_LOG_ERR
- * - PEAR_LOG_WARNING
- * - PEAR_LOG_NOTICE
- * - PEAR_LOG_INFO
- * - PEAR_LOG_DEBUG
+ * @param mixed $message Either a string or a PEAR_Error object.
+ * @param string $priority The priority of the message. One of:
+ * - EMERG
+ * - ALERT
+ * - CRIT
+ * - ERR
+ * - WARN
+ * - NOTICE
+ * - INFO
+ * - DEBUG
*/
- function logMessage($message, $file, $line, $priority = PEAR_LOG_INFO)
+ function logMessage($message, $priority = 'INFO')
{
+ $trace = debug_backtrace();
+ $trace = $trace[1];
+
// Internal logging to $this->_logtext.
- parent::logMessage($message, $file, $line, $priority);
+ parent::logMessage($message, $priority);
// Logging to Horde log:
- Horde::logMessage($message, $file, $line, $priority);
+ Horde::logMessage($message, $priority, array('file' => $trace['file'], 'line' => $trace['line']));
}
/**
$this ->_db = &MDB2::connect($params['dsn']);
if (is_a($this->_db, 'PEAR_Error')) {
- $this->logMessage($this->_db,
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ $this->logMessage($this->_db, 'ERR');
}
}
default:
$this->logMessage('Invalid database ' . $database
- . '. Try tasks, calendar, notes or contacts.',
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ . '. Try tasks, calendar, notes or contacts.', 'ERR');
return false;
}
}
if ($sync_ts && $sync_ts >= $suid_ts) {
// Change was done by us upon request of client, don't mirror
// that back to the client.
- $this->logMessage("Added to server from client: $suid ignored",
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $this->logMessage("Added to server from client: $suid ignored", 'DEBUG');
continue;
}
$adds[$suid] = 0;
// Change was done by us upon request of client, don't
// mirror that back to the client.
$this->logMessage(
- "Changed on server after sent from client: $suid ignored",
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ "Changed on server after sent from client: $suid ignored", 'DEBUG');
continue;
}
$mods[$suid] = $this->_getCuid($databaseURI, $suid);
}
$this->logMessage('_trackDeletes() with ' . count($currentSuids)
- . ' current ids',
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ . ' current ids', 'DEBUG');
$r = $this->_db->queryCol(
'SELECT syncml_suid FROM syncml_suidlist '
}
$this->logMessage('_trackDeletes() found ' . count($r)
- . ' items in prevlist',
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ . ' items in prevlist', 'DEBUG');
// Convert to hash with suid as key.
if (is_array($r)) {
}
$this->logMessage('_trackDeletes() with ' . count($prevSuids)
- . ' deleted items',
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ . ' deleted items', 'DEBUG');
return array_keys($prevSuids);
}
{
$database = $this->_normalize($databaseURI);
- $this->logMessage('_removeFromSuidList(): item ' . $suid,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $this->logMessage('_removeFromSuidList(): item ' . $suid, 'DEBUG');
$r = $this->_db->queryCol(
'DELETE FROM syncml_suidlist '
. 'WHERE syncml_syncpartner = '
return $r;
}
- $this->logMessage('_removeFromSuidList(): result ' . implode('!', $r),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $this->logMessage('_removeFromSuidList(): result ' . implode('!', $r), 'DEBUG');
return true;
}
$cmd = new $class($outputHandler);
} else {
$msg = 'Class definition of ' . $class . ' not found.';
- $GLOBALS['backend']->logMessage($msg, __FILE__, __LINE__,
- PEAR_LOG_ERR);
+ $GLOBALS['backend']->logMessage($msg, __FILE__, __LINE__, 'ERR');
$cmd = PEAR::raiseError($msg);
}
list($clientlast, $serverAnchorLast) = $r;
$GLOBALS['backend']->logMessage(
'Previous sync found for database ' . $database
- . '; client timestamp: ' . $clientlast,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ . '; client timestamp: ' . $clientlast, 'DEBUG');
// Check if anchor sent from client matches our own stored
// data.
$anchormatch = true;
$GLOBALS['backend']->logMessage(
'Anchor timestamps match, TwoWaySync possible. Syncing data since '
- . date('Y-m-d H:i:s', $serverAnchorLast),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ . date('Y-m-d H:i:s', $serverAnchorLast), 'DEBUG');
} else {
// Server and client have different anchors, enforce
// SlowSync/RefreshSync
'Client requested sync with anchor timestamp '
. $this->_metaAnchorLast
. ' but server has recorded timestamp '
- . $clientlast . '. Enforcing SlowSync',
- __FILE__, __LINE__, PEAR_LOG_INFO);
+ . $clientlast . '. Enforcing SlowSync', 'INFO');
$anchormatch = false;
$clientlast = 0;
}
// No info about previous sync, use SlowSync or RefreshSync.
$GLOBALS['backend']->logMessage(
'No info about previous syncs found for device ' .
- $state->sourceURI . ' and database ' . $database,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $state->sourceURI . ' and database ' . $database, 'DEBUG');
$clientlast = 0;
$serverAnchorLast = 0;
$anchormatch = false;
default:
$GLOBALS['backend']->logMessage(
- 'Unknown sync type ' . $this->_alert,
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ 'Unknown sync type ' . $this->_alert, 'ERR');
break;
}
if (!$sync) {
$GLOBALS['backend']->logMessage(
'Creating SyncML_Sync object for database '
- . $this->_targetLocURI . '; sync type ' . $synctype,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ . $this->_targetLocURI . '; sync type ' . $synctype, 'DEBUG');
$sync = new SyncML_Sync($synctype,
$this->_targetLocURI,
$this->_sourceLocURI,
$this->_outputHandler->outputGetDevInf();
}
- $GLOBALS['backend']->logMessage('Received <Final> from client.',
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $GLOBALS['backend']->logMessage('Received <Final> from client.', 'DEBUG');
$state->handleFinal($this->_outputHandler, $debug);
}
$sync = &$state->getSync($this->_targetLocURI);
if (!$state->authenticated) {
$GLOBALS['backend']->logMessage(
- 'Not authenticated while processing <Map>',
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ 'Not authenticated while processing <Map>', 'ERR');
} else {
foreach ($this->_mapSources as $key => $source) {
$sync->createUidMap($this->_targetLocURI,
if (!is_object($sync)) {
$GLOBALS['backend']->logMessage(
- 'No sync object found for URI ' . $this->_targetURI,
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ 'No sync object found for URI ' . $this->_targetURI, 'ERR');
// @todo: create meaningful status code here.
}
}
if (!isset($_SESSION['SyncML.state'])) {
$GLOBALS['backend']->logMessage(
- 'New session created: ' . session_id(),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ 'New session created: ' . session_id(), 'DEBUG');
$_SESSION['SyncML.state'] = new SyncML_State($this->_sourceURI,
$this->user,
$this->_sessionID);
} else {
$GLOBALS['backend']->logMessage(
- 'Existing session continued: ' . session_id(),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ 'Existing session continued: ' . session_id(), 'DEBUG');
}
$state = &$_SESSION['SyncML.state'];
if (empty($driver) || $driver == 'none' || $driver == 'default') {
$GLOBALS['backend']->logMessage(
- 'Using default device class',
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ 'Using default device class', 'DEBUG');
return new SyncML_Device();
}
}
$device = new $class();
- $GLOBALS['backend']->logMessage('Created device class ' . $class,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $GLOBALS['backend']->logMessage('Created device class ' . $class, 'DEBUG');
return $device;
}
sprintf('Sync4j for name %s, value %s',
$item['name'],
is_string($item['value'])
- ? $item['value'] : var_export($item['value'], true)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ ? $item['value'] : var_export($item['value'], true)), 'DEBUG');
switch (Horde_String::upper($item['name'])) {
case 'DTSTART':
!empty($end) && $start != $end) {
$hash['Duration'] = ($end - $start) / 60;
$GLOBALS['backend']->logMessage(
- 'Duration set to ' . $hash['Duration'],
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ 'Duration set to ' . $hash['Duration'], 'DEBUG');
}
global $backend;
$backend->logMessage(
- 'Handling <' . $item->elementType . '> sent from client',
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ 'Handling <' . $item->elementType . '> sent from client', 'DEBUG');
/* if size of item is set: check it first */
if ($item->size > 0) {
$item->responseCode = RESPONSE_SIZE_MISMATCH;
$backend->logMessage(
'Item size mismatch. Size reported as ' . $item->size
- . ' but actual size is ' . strlen($item->content),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ . ' but actual size is ' . strlen($item->content), 'ERR');
$this->_errors++;
return false;
}
if (!is_a($suid, 'PEAR_Error')) {
$this->_client_add_count++;
$item->responseCode = RESPONSE_ITEM_ADDED;
- $backend->logMessage('Added client entry as ' . $suid,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $backend->logMessage('Added client entry as ' . $suid, 'DEBUG');
} else {
$this->_errors++;
/* @todo: better response code. */
$item->responseCode = RESPONSE_NO_EXECUTED;
- $backend->logMessage('Error in adding client entry: ' . $suid->message, __FILE__, __LINE__, PEAR_LOG_ERR);
+ $backend->logMessage('Error in adding client entry: ' . $suid->message, 'ERR');
}
} elseif ($item->elementType == 'Delete') {
/* Handle client delete requests. */
$ok = $backend->deleteEntry($database, $cuid);
if (!$ok && $tasksincalendar) {
$backend->logMessage(
- 'Task ' . $cuid . ' deletion sent with calendar request',
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ 'Task ' . $cuid . ' deletion sent with calendar request', 'DEBUG');
$ok = $backend->deleteEntry($this->_taskToCalendar($backend->_normalize($database)), $cuid);
}
if ($ok) {
$this->_client_delete_count++;
$item->responseCode = RESPONSE_OK;
- $backend->logMessage('Deleted entry ' . $suid . ' due to client request', __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $backend->logMessage('Deleted entry ' . $suid . ' due to client request', 'DEBUG');
} else {
$this->_errors++;
$item->responseCode = RESPONSE_ITEM_NO_DELETED;
- $backend->logMessage('Failure deleting client entry, maybe already disappeared from server', __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $backend->logMessage('Failure deleting client entry, maybe already disappeared from server', 'DEBUG');
}
} elseif ($item->elementType == 'Replace') {
if (!is_a($suid, 'PEAR_Error')) {
$this->_client_replace_count++;
$item->responseCode = RESPONSE_OK;
- $backend->logMessage('Replaced entry ' . $suid . ' due to client request', __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $backend->logMessage('Replaced entry ' . $suid . ' due to client request', 'DEBUG');
} else {
- $backend->logMessage($suid->message, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $backend->logMessage($suid->message, 'DEBUG');
/* Entry may have been deleted; try adding it. */
$suid = $backend->addEntry($hordedatabase, $content,
$this->_client_addreplaces++;
$item->responseCode = RESPONSE_ITEM_ADDED;
$backend->logMessage(
- 'Added instead of replaced entry ' . $suid,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ 'Added instead of replaced entry ' . $suid, 'DEBUG');
} else {
$this->_errors++;
/* @todo: better response code. */
$item->responseCode = RESPONSE_NO_EXECUTED;
$backend->logMessage(
'Error in adding client entry due to replace request: '
- . $suid->message,
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ . $suid->message, 'ERR');
}
}
} else {
$backend->logMessage(
- 'Unexpected elementType: ' . $item->elementType,
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ 'Unexpected elementType: ' . $item->elementType, 'ERR');
}
return $suid;
$backend->logMessage(
'Creating <Sync> output for server changes in database '
- . $this->_targetLocURI,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ . $this->_targetLocURI, 'DEBUG');
/* If sync data from client only, nothing to be done here. */
if($this->_syncType == ALERT_ONE_WAY_FROM_CLIENT ||
$backend->logMessage(
'Compiling server changes from '
. date('Y-m-d H:i:s', $this->_serverAnchorLast)
- . ' to ' . date('Y-m-d H:i:s', $this->_serverAnchorNext),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ . ' to ' . date('Y-m-d H:i:s', $this->_serverAnchorNext), 'DEBUG');
$result = $this->_retrieveChanges($this->_targetLocURI,
$this->_server_adds,
/* If tasks are handled inside calendar, do the same again for
* tasks. Merge resulting arrays. */
- if ($backend->_normalize($this->_targetLocURI) == 'calendar' &&
+ if ($backend->_normalize($this->_targetLocURI) == 'calendar' &&
$device->handleTasksInCalendar()) {
- $backend->logMessage('Handling tasks in calendar sync',
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
-
$this->_server_task_adds = $deletes2 = $replaces2 = array();
$result = $this->_retrieveChanges('tasks',
$this->_server_task_adds,
+ count($this->_server_deletes);
$backend->logMessage(
'Sending ' . $numChanges . ' server changes ' . 'for client URI '
- . $this->_targetLocURI,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ . $this->_targetLocURI, 'DEBUG');
/* Now we know the number of Changes and can send them to the
* client. */
$backend->logMessage(
'Maximum message size ' . $state->maxMsgSize
. ' approached during delete; current size: '
- . $output->getOutputSize(),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ . $output->getOutputSize(), 'DEBUG');
$messageFull = true;
$output->outputSyncEnd();
$this->_syncsSent += 1;
return;
}
$backend->logMessage(
- "Sending delete from server: client id $cuid, server id $suid",
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ "Sending delete from server: client id $cuid, server id $suid", 'DEBUG');
/* Create a Delete request for client. */
$cmdId = $output->outputSyncCommand('Delete', null, null, null, $cuid, null);
unset($this->_server_deletes[$suid]);
/* Handle additions. */
$adds = $this->_server_adds;
foreach ($adds as $suid => $cuid) {
- $backend->logMessage("Sending add from server: $suid",
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $backend->logMessage("Sending add from server: $suid", 'DEBUG');
$syncDB = isset($this->_server_task_adds[$suid]) ? 'tasks' : $this->_targetLocURI;
$ct = isset($this->_server_task_adds[$suid]) ? $contentTypeTasks : $contentType;
if (is_a($c, 'PEAR_Error')) {
$backend->logMessage(
'API export call for ' . $suid . ' failed: '
- . $c->getMessage(),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ . $c->getMessage(), 'ERR');
} else {
list($clientContent, $clientContentType, $clientEncodingType) =
$device->convertServer2Client($c, $contentType, $syncDB);
$backend->logMessage(
'Maximum message size ' . $state->maxMsgSize
. ' approached during add; current size: '
- . $output->getOutputSize(),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ . $output->getOutputSize(), 'DEBUG');
if (strlen($clientContent) + MSG_DEFAULT_LEN > $state->maxMsgSize) {
$backend->logMessage(
- 'Data item won\'t fit into a single message. Partial sending not implemented yet. Item will not be sent!',
- __FILE__, __LINE__, PEAR_LOG_WARNING);
+ 'Data item won\'t fit into a single message. Partial sending not implemented yet. Item will not be sent!', 'WARN');
/* @todo: implement partial sending instead of
* dropping item! */
unset($this->_server_adds[$suid]);
}
$backend->logMessage(
- "Sending replace from server: $suid",
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ "Sending replace from server: $suid", 'DEBUG');
list($clientContent, $clientContentType, $clientEncodingType) =
$device->convertServer2Client($c, $contentType, $syncDB);
/* Check if we have space left in the message. */
$backend->logMessage(
'Maximum message size ' . $state->maxMsgSize
. ' approached during replace; current size: '
- . $output->getOutputSize(),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ . $output->getOutputSize(), 'DEBUG');
if (strlen($clientContent) + MSG_DEFAULT_LEN > $state->maxMsgSize) {
$backend->logMessage(
- 'Data item won\'t fit into a single message. Partial sending not implemented yet. Item will not be sent!',
- __FILE__, __LINE__, PEAR_LOG_WARNING);
+ 'Data item won\'t fit into a single message. Partial sending not implemented yet. Item will not be sent!', 'WARNING');
/* @todo: implement partial sending instead of
* dropping item! */
unset($this->_server_replaces[$suid]);
$this->_serverAnchorNext,
$adds, $replaces, $deletes);
if (is_a($result, 'PEAR_Error')) {
- $GLOBALS['backend']->logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ $GLOBALS['backend']->logMessage($result, 'ERR');
return $result;
}
}
break;
}
- $GLOBALS['backend']->logMessage('Handle <Final> for state ' . $state,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $GLOBALS['backend']->logMessage('Handle <Final> for state ' . $state, 'DEBUG');
switch ($this->_state) {
case STATE_INIT:
$this->_server_add_count,
$this->_server_replace_count,
$this->_server_delete_count);
- $GLOBALS['backend']->logMessage($s , __FILE__, __LINE__, PEAR_LOG_INFO);
+ $GLOBALS['backend']->logMessage($s, 'INFO');
}
function getServerLocURI()
$GLOBALS['backend']->createUidMap($db, $cuid, $suid);
$GLOBALS['backend']->logMessage(
'Created map for client id ' . $cuid . ' and server id ' . $suid
- . ' in database ' . $db,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ . ' in database ' . $db, 'DEBUG');
}
function logMessage() {}
}
$backend = new BackendStub();
-define('PEAR_LOG_DEBUG', null);
// Load device handler.
require_once dirname(__FILE__) . '/../SyncML/Device.php';
class Backend extends SyncML_Backend {
- var $_logLevel = PEAR_LOG_DEBUG;
+ var $_logLevel = 'DEBUG';
- function logMessage($message, $file, $line, $priority = PEAR_LOG_INFO)
+ function logMessage($message, $priority = 'INFO')
{
- parent::logMessage($message, $file, $line, $priority);
+ parent::logMessage($message, $priority);
echo $this->_logtext;
$this->_logtext = '';
}
/* log all (wb)xml packets received or sent to debug_dir: */
'debug_files' => true,
/* Log everything: */
- 'log_level' => PEAR_LOG_DEBUG);
+ 'log_level' => 'DEBUG');
/* Get any options. */
if (!isset($argv)) {
if ($this->_cache &&
isset($cacheid) &&
!$this->_cache->set($cacheid, $this->_template)) {
- Horde::logMessage(sprintf(_("Could not save the compiled template file '%s'."), $file), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage(sprintf(_("Could not save the compiled template file '%s'."), $file), 'ERR');
}
}
/* Return an error if the update fails. */
$result = $this->_write_db->query($query, $values);
if ($result instanceof PEAR_Error) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
throw new Horde_Exception_Prior($result);
}
}
$result = $this->_db->getOne($query, $values);
if ($result instanceof PEAR_Error) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return false;
} else {
return !empty($result);
$result = $this->_write_db->query($query, $values);
if ($result instanceof PEAR_Error) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
throw new Horde_Exception_Prior($result);
}
}
// this line, but add a check and a log message to help the devs
// track down and fix this issue.
if (is_a($input, 'PEAR_Error')) {
- Horde::logMessage('Called convertCharset() on a PEAR_Error object. ' . print_r($input, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Called convertCharset() on a PEAR_Error object. ' . print_r($input, true), 'DEBUG');
return '';
}
$input = Horde_Util::cloneObject($input);
}
$caller .= ' on line ' . $bt[0]['line'] . ' of ' . $bt[0]['file'];
- Horde::logMessage('Horde_Util::cloneObject called on variable of type ' . gettype($obj) . ' by ' . $caller, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Horde_Util::cloneObject called on variable of type ' . gettype($obj) . ' by ' . $caller, 'DEBUG');
$ret = $obj;
return $ret;
$entry = sprintf('Login success for %s [%s] to {%s}',
$user, $_SERVER['REMOTE_ADDR'],
$backend_key);
- Horde::logMessage($entry, __FILE__, __LINE__,
- PEAR_LOG_NOTICE);
+ Horde::logMessage($entry, 'NOTICE');
return true;
}
}
require GOLLEM_BASE . '/config/backends.php';
if (empty($backends[$key])) {
$entry = sprintf('Invalid server key from client [%s]', $_SERVER['REMOTE_ADDR']);
- Horde::logMessage($entry, __FILE__, __LINE__, PEAR_LOG_INFO);
+ Horde::logMessage($entry, 'INFO');
return false;
}
if (!Gollem::verifyDir($ptr['home'])) {
$error_msg = 'Backend Configuration Error: Home directory not below root.';
$auth_gollem->gollemSetAuthErrorMsg($error_msg);
- Horde::logMessage(PEAR::raiseError($error_msg), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($error_msg, 'ERR');
unset($_SESSION['gollem']['backends'][$key]);
$_SESSION['gollem']['backend_key'] = null;
return false;
if (is_a($res, 'PEAR_Error')) {
$error_msg = 'Backend Configuration Error: Could not create home directory ' . $ptr['home'] . '.';
$auth_gollem->gollemSetAuthErrorMsg($error_msg);
- Horde::logMessage(PEAR::raiseError($error_msg), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($error_msg, 'ERR');
unset($_SESSION['gollem']['backends'][$key]);
$_SESSION['gollem']['backend_key'] = null;
return false;
if (is_callable(array($GLOBALS['gollem_vfs'], 'readStream'))) {
$stream = $GLOBALS['gollem_vfs']->readStream($filedir, $filename);
if (is_a($stream, 'PEAR_Error')) {
- Horde::logMessage($stream, __FILE__, __LINE__, PEAR_LOG_NOTICE);
+ Horde::logMessage($stream, 'NOTICE');
printf(_("Access denied to %s"), $filename);
exit;
}
} else {
$data = $GLOBALS['gollem_vfs']->read($filedir, $filename);
if (is_a($data, 'PEAR_Error')) {
- Horde::logMessage($data, __FILE__, __LINE__, PEAR_LOG_NOTICE);
+ Horde::logMessage($data, 'NOTICE');
printf(_("Access denied to %s"), $filename);
exit;
}
$child = &$groups->newGroup(Horde_Util::getFormData('child'), $parent);
}
if (is_a($child, 'PEAR_Error')) {
- Horde::logMessage($child, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($child, 'ERR');
$notification->push(sprintf(_("Group was not created: %s."), $child->getMessage()), 'horde.error');
break;
}
$result = $groups->addGroup($child);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
$notification->push(sprintf(_("\"%s\" was not created: %s."), $child->getShortName(), $result->getMessage()), 'horde.error');
} else {
$notification->push(sprintf(_("\"%s\" was added to the groups system."), $child->getShortName()), 'horde.success');
}
$signup = Horde_Auth_Signup::factory();
if (is_a($signup, 'PEAR_Error')) {
- Horde::logMessage($signup, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($signup, 'ERR');
throw new Horde_Exception(_("User Registration is not properly configured for this site."));
}
<configswitch name="enabled" quote="false" desc="Should Horde log errors and
other useful information?">true
<case name="true" desc="Yes">
- <configenum name="priority" quote="false" desc="What level of messages
- should we log? Each level logs itself and all those that come before it:
- PEAR_LOG_ALERT would only log alerts and emergencies, but PEAR_LOG_DEBUG
- would log everything.">PEAR_LOG_NOTICE
+ <configenum name="priority" desc="What level of messages should we log?
+ Each level logs itself and all those that come before it: ALERT would
+ only log alerts and emergencies, but DEBUG would log everything.">NOTICE
<values>
- <value desc="PEAR_LOG_EMERG">PEAR_LOG_EMERG</value>
- <value desc="PEAR_LOG_ALERT">PEAR_LOG_ALERT</value>
- <value desc="PEAR_LOG_CRIT">PEAR_LOG_CRIT</value>
- <value desc="PEAR_LOG_ERR">PEAR_LOG_ERR</value>
- <value desc="PEAR_LOG_WARNING">PEAR_LOG_WARNING</value>
- <value desc="PEAR_LOG_NOTICE">PEAR_LOG_NOTICE</value>
- <value desc="PEAR_LOG_INFO">PEAR_LOG_INFO</value>
- <value desc="PEAR_LOG_DEBUG">PEAR_LOG_DEBUG</value>
+ <value desc="EMERG">EMERG</value>
+ <value desc="ALERT">ALERT</value>
+ <value desc="CRIT">CRIT</value>
+ <value desc="ERR">ERR</value>
+ <value desc="WARNING">WARNING</value>
+ <value desc="NOTICE">NOTICE</value>
+ <value desc="INFO">INFO</value>
+ <value desc="DEBUG">DEBUG</value>
</values>
</configenum>
<configstring name="ident" desc="What identifier should we use in the
logs?">HORDE</configstring>
- <configsection name="params">
- <configplaceholder/>
- </configsection>
-
<configswitch name="type" desc="What log driver should we use?">file
- <case name="console" desc="Console">
- <configsection name="params">
- <configphp name="stream" required="false" desc="The output stream to
- use"/>
- <configboolean name="buffering" required="false" desc="Should the
- output be buffered until shutdown?">false</configboolean>
- <configstring name="lineFormat" required="false" desc="Log line format
- specification"/>
- <configstring name="timeFormat" required="false" desc="Time stamp
- format"/>
- </configsection>
- </case>
-
- <case name="display" desc="Display">
- <configsection name="params">
- <configstring name="error_prepend" required="false" desc="This string
- will be prepended to the log output"/>
- <configstring name="error_append" required="false" desc="This string
- will be appended to the log output"/>
- </configsection>
- </case>
-
- <case name="error_log" desc="Error Log">
- <configsection name="params">
- <configstring name="destination" required="false" desc="Optional
- destination value for error_log(). See
- http://www.csh.rit.edu/~jon/projects/pear/Log/guide.html#error-log-types
- for more details."/>
- <configstring name="extra_headers" required="false" desc="Additional
- headers to pass to the mail() function when the PEAR_LOG_TYPE_MAIL type
- is specified"/>
- </configsection>
- </case>
-
<case name="file" desc="File">
<configstring name="name" desc="Path to the log
file">/tmp/horde.log</configstring>
<configboolean name="append" required="false" desc="Should new log
entries be appended to an existing log file? If this is false, new log
files will overwrite existing ones.">true</configboolean>
- <configinteger name="mode" octal="true" required="false" desc="Octal
- representation of the log file's permissions mode"/>
- <configphp name="eol" required="false" desc="The end-of-line character
- sequence"/>
- <configstring name="lineFormat" required="false" desc="Log line format
- specification"/>
- <configstring name="timeFormat" required="false" desc="Time stamp
- format"/>
</configsection>
</case>
- <case name="mail" desc="Mail">
- <configstring name="name" desc="The recipient for the message"/>
- <configsection name="params">
- <configstring name="from" required="false" desc="Value for the
- message's From: header"/>
- <configstring name="subject" required="false" desc="Value for the
- message's Subject: header"/>
- <configstring name="preamble" required="false" desc="Preamble for the
- message"/>
- </configsection>
- </case>
-
- <case name="null" desc="Null"/>
-
- <case name="sql" desc="SQL">
- <configstring name="name" desc="The table to log
- to">log_table</configstring>
- <configsection name="params">
- <configphp name="dsn" desc="A Data Source
- Name">$conf['sql']</configphp>
- </configsection>
- </case>
-
- <case name="sqlite" desc="SQLite">
- <configstring name="name" desc="The table to log
- to">log_table</configstring>
- <configsection name="params">
- <configstring name="filename" desc="Path to an Sqlite database"/>
- <configinteger name="mode" octal="true" required="false" desc="Octal
- mode used to open the database [0666]"/>
- <configboolean name="persistent" required="false" desc="Use a
- persistent connection">false</configboolean>
- </configsection>
+ <case name="stream" desc="PHP Stream">
+ <configstring name="name" desc="A valid-PHP stream interface to use
+ for logging."></configstring>
</case>
<case name="syslog" desc="Syslog">
<configphp name="name" quote="false" desc="Syslog facility to use"/>
</case>
-
- <case name="win" desc="Window">
- <configstring name="name" desc="Name of the opened window"/>
- <configsection name="params">
- <configstring name="title" required="false" desc="The title of the
- output window"/>
- </configsection>
- </case>
</configswitch>
</case>
<configboolean name="log_accesskeys" desc="Should Horde log statistics about
used access keys? This is only useful for translators of the
UI. You also need to set the log level to at least
- PEAR_LOG_INFO.">false</configboolean>
+ INFO.">false</configboolean>
</configtab>
<configtab name="prefs" desc="Preference System">
3. Install PEAR packages::
- pear install -o Log Mail DB Date File
+ pear install -o Mail DB Date File
pear -d preferred_state=beta install -a Services_Weather
4. Extract tarball::
These PEAR modules are **REQUIRED** to be installed for complete Horde
functionality:
- a. Log
- b. Mail (>= 1.2.0)
+ a. Mail (>= 1.2.0)
To install, enter the following at the command prompt::
- pear install Log Mail
+ pear install Mail
These PEAR modules are **RECOMMENDED** to be installed:
/* Remove user's prefs */
$prefs = Horde_Prefs::singleton($conf['prefs']['driver'], null, $user);
if (is_a($result = $prefs->clear(), 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
$haveError = true;
}
$groups = Group::singleton();
$allGroups = $groups->getGroupMemberships($user);
if (is_a($groups, 'PEAR_Error')) {
- Horde::logMessage($allGroups, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($allGroups, 'ERR');
$haveError = true;
} else {
foreach (array_keys($allGroups) as $id) {
$perms = $GLOBALS['injector']->getInstance('Horde_Perms');
$tree = $perms->getTree();
if (is_a($tree, 'PEAR_Error')) {
- Horde::logMessage($tree, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($tree, 'ERR');
$haveError = true;
} else {
foreach (array_keys($tree) as $id) {
$perm = $perms->getPermissionById($id);
if (is_a($perm, 'PEAR_Error')) {
- Horde::logMessage($perm, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($perm, 'ERR');
$haveError = true;
continue;
}
/* Get all APIs */
$apis = $this->listAPIs();
if (is_a($apis, 'PEAR_Error')) {
- Horde::logMessage($apis, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($apis, 'ERR');
return PEAR::raiseError(_("No API found."));
}
foreach ($apis as $api) {
if ($GLOBALS['registry']->hasAppMethod($api, 'removeUserData')) {
$result = $GLOBALS['registry']->callAppMethod($api, 'removeUserData', array('args' => array($user)));
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
$haveError = true;
}
}
function _params()
{
if (!@include_once 'Services/Weather.php') {
- Horde::logMessage('The metar block will not work without Services_Weather from PEAR. Run pear install Services_Weather.',
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage('The metar block will not work without Services_Weather from PEAR. Run pear install Services_Weather.', 'ERR');
return array(
'error' => array(
'type' => 'error',
function _content()
{
if (!@include_once 'Services/Weather.php') {
- Horde::logMessage('The metar block will not work without Services_Weather from PEAR. Run pear install Services_Weather.',
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage('The metar block will not work without Services_Weather from PEAR. Run pear install Services_Weather.', 'ERR');
return _("Metar block not available. Details have been logged for the administrator.");
}
function _params()
{
if (!@include_once 'Services/Twitter.php') {
- Horde::logMessage('The Twitter block will not work without Services_Twitter from PEAR. Run pear install Services_Twitter.',
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage('The Twitter block will not work without Services_Twitter from PEAR. Run pear install Services_Twitter.', 'ERR');
return array(
'error' => array(
'type' => 'error',
function _content()
{
if (!@include_once 'Services/Twitter.php') {
- Horde::logMessage('The Twitter block will not work without Services_Twitter from PEAR. Run pear install Services_Twitter.',
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage('The Twitter block will not work without Services_Twitter from PEAR. Run pear install Services_Twitter.', 'ERR');
return _("Twitter block not available. Details have been logged for the administrator.");
}
empty($this->_params['password'])) {
return _("Must configure a Twitter username and password to use this block.");
}
-
+
// Store the username and password in the session to enable
// services/twitterapi.php's functionality.
$_SESSION['horde']['twitterblock']['username'] = $this->_params['username'];
$_SESSION['horde']['twitterblock']['password'] = $this->_params['password'];
-
+
// Get a unique instance ID in case someone likes to have multiple
// Twitter blocks.
$instance = md5(serialize(array($this->_params['username'],
. '<input style="width:98%;margin-top:4px;margin-bottom:4px;" type="text" id="' . $instance . '_newStatus" name="' . $instance . '_newStatus" value="What are you working on?" />'
. '<div class="fbaction"><a class="fbbutton" onclick="updateStatus($F(\'' . $instance . '_newStatus\'));" href="#">' . _("Update") . '</a></div>'
. Horde::img('loading.gif', '', array('id' => $instance . '_loading', 'style' => 'display:none;'));
-
+
return $html;
}
!(@include_once 'Cache.php') ||
!(@include_once 'XML/Serializer.php') ||
!ini_get('allow_url_fopen')) {
- Horde::logMessage('The weather.com block will not work without PEAR\'s Services_Weather, Cache, and XML_ Serializer packages, and allow_url_fopen enabled. Run `pear install Services_Weather Cache XML_Serializer´ and ensure that allow_url_fopen is enabled in php.ini.',
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage('The weather.com block will not work without PEAR\'s Services_Weather, Cache, and XML_ Serializer packages, and allow_url_fopen enabled. Run `pear install Services_Weather Cache XML_Serializer´ and ensure that allow_url_fopen is enabled in php.ini.', 'ERR');
$params = array(
'error' => array(
'type' => 'error',
if (!(@include_once 'Services/Weather.php') ||
!(@include_once 'Cache.php') ||
!ini_get('allow_url_fopen')) {
- Horde::logMessage('The weather.com block will not work without the PEARServices_Weather and Cache packages, and allow_url_fopen enabled. Run pear install Services_Weather Cache, and ensure that allow_url_fopen_wrappers is enabled in php.ini.',
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage('The weather.com block will not work without the PEARServices_Weather and Cache packages, and allow_url_fopen enabled. Run pear install Services_Weather Cache, and ensure that allow_url_fopen_wrappers is enabled in php.ini.', 'ERR');
return _("The weather.com block is not available.");
}
}
}
- Horde::logMessage('Cleaned out static files for ' . $type, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Cleaned out static files for ' . $type, __FILE__, __LINE__, 'DEBUG');
}
}
'HTTP_WebDAV_Server' => array(
'error' => 'The HTTP_WebDAV_Server is required if you want to use the WebDAV interface of Horde, e.g. to access calendars or tasklists with external clients.'
),
- 'Log' => array(
- 'error' => 'Make sure you are using a version of PEAR which includes the Log classes, or that you have installed the Log package seperately. See the INSTALL file for instructions on installing Log.',
- 'function' => '_checkPearLogVersion',
- 'required' => true
- ),
'Mail' => array(
'path' => 'Mail/RFC822.php',
'error' => 'You do not have the Mail package installed on your system. See the INSTALL file for instructions on how to install the package.'
}
/**
- * Additional check for PEAR Log module for its version.
- *
- * @return string Returns error string on error.
- */
- protected function _checkPearLogVersion()
- {
- if (!defined('PEAR_LOG_INFO')) {
- return 'Your version of Log is not recent enough.';
- }
- }
-
- /**
* Additional check for PEAR DB module for its version.
*
* @return string Returns error string on error.
include_once 'Horde/Autoloader.php';
Horde_Autoloader::addClassPattern('/^Horde(?:$|_)/i', dirname(__FILE__));
-/* Log (need to include because of LOG constants). */
-include_once 'Log.php';
-
/* Default exception handler for uncaught exceptions. The default fatal
* exception handler output may include things like passwords, etc. so don't
* output this unless an admin. */
: Horde_Nls::select();
$entry = sprintf('User %s [%s] logged out of Horde', $is_auth, $_SERVER['REMOTE_ADDR']);
- Horde::logMessage($entry, __FILE__, __LINE__, PEAR_LOG_NOTICE);
+ Horde::logMessage($entry, 'NOTICE');
Horde_Auth::clearAuth();
@session_destroy();
if ($auth->authenticate(Horde_Util::getPost('horde_user'), $auth_params)) {
$entry = sprintf('Login success for %s [%s] to %s.', Horde_Auth::getAuth(), $_SERVER['REMOTE_ADDR'], ($app && $is_auth) ? $app : 'horde');
- Horde::logMessage($entry, __FILE__, __LINE__, PEAR_LOG_NOTICE);
+ Horde::logMessage($entry, 'NOTICE');
if (!empty($url_in)) {
/* $horde_login_url is used by horde/index.php to redirect to URL
$entry = sprintf('FAILED LOGIN for %s [%s] to Horde',
Horde_Util::getFormData('horde_user'), $_SERVER['REMOTE_ADDR']);
- Horde::logMessage($entry, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($entry, 'ERR');
} else {
$new_lang = Horde_Util::getGet('new_lang');
if ($new_lang) {
// Clear the output buffer that we started above, and log any unexpected
// output at a DEBUG level.
if (ob_get_length()) {
- Horde::logMessage('Unexpected output (' . $app . '): ' . ob_get_clean(), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Unexpected output (' . $app . '): ' . ob_get_clean(), __FILE__, __LINE__, 'DEBUG');
}
// Send the final result.
$vfs = VFS::singleton($conf['vfs']['type'], Horde::getDriverConfig('vfs', $conf['vfs']['type']));
$file_data = $vfs->read($path, $file);
} catch (VFS_Exception $e) {
- Horde::logMessage(sprintf('Error displaying image [%s]: %s', $path . '/' . $file, $e->getMessage()), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage(sprintf('Error displaying image [%s]: %s', $path . '/' . $file, $e->getMessage()), 'ERR');
exit;
}
}
}
if (!file_exists($file_name)) {
- Horde::logMessage(sprintf('Image not found [%s]', $file_name), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage(sprintf('Image not found [%s]', $file_name), 'ERR');
exit;
}
$file_data = file_get_contents($file_name);
try {
$block = Horde_Block_Collection::getBlock($params['app'], $params['blockname']);
} catch (Horde_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
continue;
}
try {
$block->buildTree($tree, 0, isset($params['menu_parent']) ? $params['menu_parent'] : null);
} catch (Horde_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
continue;
}
} else {
}
} catch (Horde_Exception $e) {
$notification->push(_("The new from address can't be verified, try again later: ") . $e->getMessage(), 'horde.error');
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
}
break;
}
$_SERVER['REMOTE_ADDR'],
preg_replace('/^.*<([^>]+)>.*$/', '$1', $conf['problems']['email']),
preg_replace('/^.*<([^>]+)>.*$/', '$1', $email)),
- __FILE__, __LINE__, PEAR_LOG_INFO);
+ __FILE__, __LINE__, 'INFO');
/* Return to previous page and exit this script. */
_returnToPage();
header('Location: ' . Horde::getServiceLink('login')->add('url', $info['url'])->setRaw(true));
exit;
} catch (Horde_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
$notification->push(_("Your password has been reset, but couldn't be sent to you. Please contact the administrator."), 'horde.error');
}
} else {
$conf['auth']['list_users'] == 'both')) {
$userList = $auth->listUsers();
if ($userList instanceof PEAR_Error) {
- Horde::logMessage($userList, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($userList, 'ERR');
$userList = array();
}
sort($userList);
$groupList = $groups->getGroupMemberships(Horde_Auth::getAuth(), true);
}
if ($groupList instanceof PEAR_Error) {
- Horde::logMessage($groupList, __FILE__, __LINE__, PEAR_LOG_NOTICE);
+ Horde::logMessage($groupList, 'NOTICE');
$groupList = array();
}
asort($groupList);
case 'updateStatus':
try {
$result = $twitter->statuses->update(Horde_Util::getPost('statusText'));
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($result, 'DEBUG');
$notification->push(_("Status successfully updated."), 'horde.success');
} catch (Services_Twitter_Exception $e) {
$error = $e->getMessage();
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
$notification->push($error);
}
}
$signup = Horde_Auth_Signup::factory();
if (is_a($signup, 'PEAR_Error')) {
- Horde::logMessage($signup->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($signup, 'ERR');
$notification->push(_("User Registration is not properly configured for this site."), 'horde.error');
header('Location: ' . Horde::getServiceLink('login')->setRaw(true));
exit;
function getDimensions()
{
$tmp_file = Horde_Util::getTempFile('fax', true, '/tmp');
- Horde::logMessage('Created temp file:' . Horde_Util::bufferOutput('var_dump', $tmp_file) . ':', __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Created temp file:' . Horde_Util::bufferOutput('var_dump', $tmp_file) . ':', 'DEBUG');
$fp = fopen($tmp_file, 'w');
fwrite($fp, $this->_data);
fclose($fp);
/* Run a ImageMagick identify command on the file to get the details. */
$command = sprintf('%s %s', $this->_cmd['identify'], $tmp_file);
- Horde::logMessage('External command call by Hylax_Image::getDimensions(): :' . $command . ':', __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('External command call by Hylax_Image::getDimensions(): :' . $command . ':', 'DEBUG');
exec($command, $output, $retval);
$init = strlen($tmp_file);
/* Figure out the dimensions from the output. */
- Horde::logMessage('External command output by Hylax_Image::getDimensions(): ' . serialize($output), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('External command output by Hylax_Image::getDimensions(): ' . serialize($output), 'DEBUG');
foreach ($output as $key => $line) {
if (substr($line, 0, $init) != $tmp_file) {
continue;
$tmp_file,
$page,
$tmp_file_out);
- Horde::logMessage('Executing command: ' . $command, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Executing command: ' . $command, 'DEBUG');
exec($command);
echo file_get_contents($tmp_file_out);
}
/* Convert the page from the postscript file to PDF. */
$command = sprintf('%s %s -', $this->_cmd['ps2pdf'], $tmp_file);
- Horde::logMessage('Executing command: ' . $command, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Executing command: ' . $command, 'DEBUG');
passthru($command);
}
$this->_params['attribute_table'],
implode(', ', $id));
- Horde::logMessage('SQL Query by Hylax_SQL_Attributes::getAttributes(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by Hylax_SQL_Attributes::getAttributes(): ' . $query, 'DEBUG');
$rows = $this->_db->getAll($query, DB_FETCHMODE_ASSOC);
if (is_a($rows, 'PEAR_Error')) {
return $rows;
$this->_params['id_column'],
$this->_params['attribute_table'],
(int)$id);
- Horde::logMessage('SQL Query by Hylax_SQL_Attributes::getAttributes(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by Hylax_SQL_Attributes::getAttributes(): ' . $query, 'DEBUG');
return $this->_db->getAll($query, DB_FETCHMODE_ASSOC);
}
}
$query,
$pairs);
- Horde::logMessage('SQL Query by Hylax_SQL_Attributes::getByAttributes(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by Hylax_SQL_Attributes::getByAttributes(): ' . $query, 'DEBUG');
return $this->_db->getCol($query);
}
$attr['key'],
$attr['value']);
- Horde::logMessage('SQL Query by Hylax_SQL_Attributes::insertAttributes(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by Hylax_SQL_Attributes::insertAttributes(): ' . $query, 'DEBUG');
$result = $this->_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
$this->_params['id_column'],
(int)$id);
- Horde::logMessage('SQL Query by Hylax_SQL_Attributes::deleteAttributes(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by Hylax_SQL_Attributes::deleteAttributes(): ' . $query, 'DEBUG');
$result = $this->_db->query($query);
if (is_a($result, 'PEAR_Error')) {
return $result;
try {
$this->_vfs->writeData($path, $file, $data, true);
} catch (VFS_Exception $e) {
- Horde::logMessage('Could not save fax file to VFS: ' . $e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage('Could not save fax file to VFS: ' . $e->getMessage(), 'ERR');
throw $e;
}
return $fax_id;
$data = $this->getFaxData($info['fax_id']);
if (is_a($data, 'PEAR_Error')) {
- Horde::logMessage('Could not get fax data: ' . $data->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage('Could not get fax data: ' . $data->getMessage(), 'ERR');
return $data;
}
try {
return $this->_vfs->read($path, $file);
} catch (VFS_Exception $e) {
- Horde::logMessage(sprintf("%s '%s/%s'.", $e->getMessage(), $path, $file), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage(sprintf("%s '%s/%s'.", $e->getMessage(), $path, $file), 'ERR');
throw $e;
}
}
{
$id = $this->_db->nextId('hylax_faxes');
if (is_a($id, 'PEAR_Error')) {
- Horde::logMessage('Could not generate new fax id. %s' . $id->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage('Could not generate new fax id. %s' . $id->getMessage(), 'ERR');
} else {
- Horde::logMessage('Generated new fax id: ' . $id, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Generated new fax id: ' . $id, 'DEBUG');
}
return $id;
}
$info['fax_pages'],
$info['fax_created'],
$info['fax_folder']);
- Horde::logMessage('SQL Query by Hylax_Storage_sql::_createFax(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by Hylax_Storage_sql::_createFax(): ' . $sql, 'DEBUG');
$result = $this->_db->query($sql, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
}
return $result;
}
{
/* Get the gateways. */
$sql = 'SELECT * FROM swoosh_gateways';
- Horde::logMessage('SQL Query by Hylax_Storage_sql::_getGateways(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by Hylax_Storage_sql::_getGateways(): ' . $sql, 'DEBUG');
$result = $this->_db->getAll($sql, DB_FETCHMODE_ASSOC);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
}
return $result;
/* Get the gateways. */
$sql = 'SELECT * FROM swoosh_gateways WHERE gateway_id = ?';
$values = array((int)$gateway_id);
- Horde::logMessage('SQL Query by Hylax_Storage_sql::getGateway(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by Hylax_Storage_sql::getGateway(): ' . $sql, 'DEBUG');
$gateway = $this->_db->getRow($sql, $values, DB_FETCHMODE_ASSOC);
if (is_a($gateway, 'PEAR_Error')) {
- Horde::logMessage($gateway, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($gateway, 'ERR');
return $gateway;
}
/* No existing gateway id, so new gateway and get next id. */
$info['gateway_id'] = $this->_db->nextId('swoosh_gateways');
if (is_a($info['gateway_id'], 'PEAR_Error')) {
- Horde::logMessage($info['gateway_id'], __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($info['gateway_id'], 'ERR');
return $info['gateway_id'];
}
$sql = 'INSERT INTO swoosh_gateways (gateway_id, gateway_driver, gateway_name, gateway_params, gateway_sendparams) VALUES (?, ?, ?, ?, ?)';
$info['gateway_name'],
$info['gateway_params'],
$info['gateway_sendparams']);
- Horde::logMessage('SQL Query by Hylax_Storage_sql::saveGateway(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by Hylax_Storage_sql::saveGateway(): ' . $sql, 'DEBUG');
$result = $this->_db->query($sql, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
{
$sql = 'DELETE FROM swoosh_gateways WHERE gateway_id = ?';
$values = array((int)$gateway_id);
- Horde::logMessage('SQL Query by Hylax_Storage_sql::deleteGateway(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by Hylax_Storage_sql::deleteGateway(): ' . $sql, 'DEBUG');
$result = $this->_db->query($sql, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
}
return $result;
{
$message_id = $this->_db->nextId('swoosh_messages');
if (is_a($message_id, 'PEAR_Error')) {
- Horde::logMessage($message_id, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($message_id, 'ERR');
return $message_id;
}
(int)time());
$result = $this->_db->query($sql, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
{
$send_id = $this->_db->nextId('swoosh_sends');
if (is_a($send_id, 'PEAR_Error')) {
- Horde::logMessage($send_id, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($send_id, 'ERR');
return $send_id;
}
$sql = 'INSERT INTO swoosh_sends (send_id, message_id, send_remote_id, send_recipient, send_status) VALUES (?, ?, ?, ?, ?)';
(is_null($error) ? 'NULL' : $error));
$result = $this->_db->query($sql, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
{
$sql = 'SELECT * FROM swoosh_messages WHERE user_uid = ?';
$values = array(Horde_Auth::getAuth());
- Horde::logMessage('SQL Query by Hylax_Storage_sql::_getMessages(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by Hylax_Storage_sql::_getMessages(): ' . $sql, 'DEBUG');
$result = $this->_db->getAssoc($sql, false, $values, DB_FETCHMODE_ASSOC);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
}
return $result;
$sql = 'SELECT message_id, swoosh_sends.* FROM swoosh_sends' .
' WHERE message_id IN (' . str_repeat('?, ', count($message_ids) - 1) . '?)';
$values = $message_ids;
- Horde::logMessage('SQL Query by Hylax_Storage_sql::_getSends(): ' . $sql, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL Query by Hylax_Storage_sql::_getSends(): ' . $sql, 'DEBUG');
$result = $this->_db->getAssoc($sql, false, $values, DB_FETCHMODE_ASSOC, true);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
}
return $result;
if (isset($args[2])) {
$info['fax_user'] = $args[2];
}
-Horde::logMessage(sprintf('Creating fax ID %s for user %s.', $info['fax_id'], $info['fax_user']), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+Horde::logMessage(sprintf('Creating fax ID %s for user %s.', $info['fax_id'], $info['fax_user']), 'DEBUG');
$hylax->storage->createFax($info, true);
/* Store the raw fax postscript data. */
$data = $cli->readStdin();
if (empty($data)) {
- Horde::logMessage('No print data received from standard input. Exiting fax submission.', __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage('No print data received from standard input. Exiting fax submission.', 'ERR');
exit;
}
/* Store the raw fax postscript data. */
$data = $cli->readStdin();
if (empty($data)) {
- Horde::logMessage('No print data received from standard input. Exiting fax submission.', __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage('No print data received from standard input. Exiting fax submission.', 'ERR');
exit;
}
echo '0';
exit;
}
-Horde::logMessage(sprintf('Creating fax ID %s for received fax.', $fax_id), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+Horde::logMessage(sprintf('Creating fax ID %s for received fax.', $fax_id), 'DEBUG');
echo $fax_id;
exit;
}
} catch (VFS_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($read_id, 'ERR');
}
} else {
/* Create a random identifier for this file. */
$msg->send($mail_address, $msg_headers);
}
} catch (VFS_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
}
}
}
try {
$file_data = $vfsroot->read($full_path, $file_name);
} catch (VFS_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($file_data, 'ERR');
throw new IMP_Exception(_("The specified file cannot be read."));
}
$mime_type = Horde_Mime_Magic::analyzeData($file_data, isset($conf['mime']['magic_db']) ? $conf['mime']['magic_db'] : null);
$spellcheck = true;
$imp_ui->attachSpellChecker();
} catch (Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
}
}
Horde::addScriptFile('ieEscGuard.js', 'horde');
}
if (!$GLOBALS['imp_imap']->createImapObject($credentials['userId'], $credentials['password'], $credentials['server'])) {
- self::logMessage('failed', __FILE__, __LINE__);
+ self::_logMessage('failed');
throw new Horde_Auth_Exception('', Horde_Auth::REASON_FAILED);
}
}
try {
$GLOBALS['imp_imap']->ob()->login();
} catch (Horde_Imap_Client_Exception $e) {
- self::logMessage($e->getMessage(), __FILE__, __LINE__);
+ self::_logMessage($e->getMessage(), 'ERR');
if ($e->getCode() == Horde_Imap_Client_Exception::SERVER_CONNECT) {
throw new Horde_Auth_Exception(_("Could not connect to the remote server."));
}
/**
* Log login related message.
*
- * @param string $status Either 'login', 'logout', 'failed', or an
- * error message.
- * @param string $file The file where the error occurred.
- * @param integer $line The line where the error occurred.
- * @param integer $level The logging level.
+ * @param Exception $status Message should contain either 'login',
+ * 'logout', 'failed', or an error message.
+ * @param mixed $level The logging level. See Horde::logMessage().
*/
- static public function logMessage($status, $file, $line,
- $level = PEAR_LOG_ERR)
+ static protected function _logMessage($status, $level)
{
switch ($status) {
case 'login':
empty($_SESSION['imp']['protocol']) ? '' : $_SESSION['imp']['protocol']
);
- Horde::logMessage($msg, $file, $line, $level);
+ Horde::logMessage($msg, $level);
}
/**
$imp_compose = IMP_Compose::singleton();
$imp_compose->recoverSessionExpireDraft();
- IMP_Auth::logMessage('login', __FILE__, __LINE__, PEAR_LOG_NOTICE);
+ self::_logMessage('login', 'NOTICE');
}
}
$this->sendMessage($val['to'], $headers, $val['msg']);
} catch (IMP_Compose_Exception $e) {
/* Unsuccessful send. */
- Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
if (isset($sentmail)) {
$sentmail->log($this->getMetadata('reply_type') || 'new', $headers->getValue('message-id'), $val['recipients'], false);
}
}
$entry = sprintf("%s Message sent to %s from %s", $_SERVER['REMOTE_ADDR'], $recipients, Horde_Auth::getAuth());
- Horde::logMessage($entry, __FILE__, __LINE__, PEAR_LOG_INFO);
+ Horde::logMessage($entry, 'INFO');
/* Should we save this message in the sent mail folder? */
if (!empty($opts['sent_folder']) &&
$timelimit = $GLOBALS['injector']->getInstance('Horde_Perms')->hasAppPermission('max_timelimit');
if ($timelimit !== true) {
if ($conf['sentmail']['driver'] == 'none') {
- Horde::logMessage('The permission for the maximum number of recipients per time period has been enabled, but no backend for the sent-mail logging has been configured for IMP.', __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage('The permission for the maximum number of recipients per time period has been enabled, but no backend for the sent-mail logging has been configured for IMP.', 'ERR');
throw new IMP_Compose_Exception(_("The system is not properly configured. A detailed error description has been logged for the administrator."));
}
$sentmail = IMP_Sentmail::factory();
try {
$results = $registry->call('contacts/search', array($emails, array($abook), array($abook => array('email'))));
} catch (Horde_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
$notification->push(_("Could not save recipients."));
return;
}
$vfs->writeData($fullpath, escapeshellcmd($att['part']->getName()), $data, true);
}
} catch (VFS_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
return IMP_Compose_Exception($e);
}
}
try {
$res = $GLOBALS['registry']->call('contacts/search', array($search, $sparams['sources'], $sparams['fields'], false));
} catch (Horde_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
return array();
}
if (empty($options['nocache']) && ($cache = $GLOBALS['injector']->getInstance('Horde_Cache'))) {
$result = $cache->get("PGPpublicKey_" . $address . $keyid, 3600);
if ($result) {
- Horde::logMessage('PGPpublicKey: ' . serialize($result), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('PGPpublicKey: ' . serialize($result), 'DEBUG');
return $result;
}
}
}
} catch (Horde_Exception $e) {
/* Return now, if no public key found at all. */
- Horde::logMessage('PGPpublicKey: ' . $e->getMessage(), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('PGPpublicKey: ' . $e->getMessage(), 'DEBUG');
throw new Horde_Exception(sprintf(_("Could not retrieve public key for %s."), $address));
}
} else {
$quotaDriver = IMP_Quota::singleton($_SESSION['imp']['imap']['quota']['driver'], isset($_SESSION['imp']['imap']['quota']['params']) ? $_SESSION['imp']['imap']['quota']['params'] : array());
$quota = $quotaDriver->getQuota();
} catch (Horde_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
return false;
}
$servers = false;
}
} catch (Horde_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
return false;
}
/* Check for the existence of the server in the config file. */
if (empty($servers[$server]) || !is_array($servers[$server])) {
$entry = sprintf('Invalid server key "%s" from client [%s]', $server, $_SERVER['REMOTE_ADDR']);
- Horde::logMessage($entry, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($entry, 'ERR');
return false;
}
*/
public function logException($e)
{
- Horde::logMessage($e, $e->getFile(), $e->getLine(), PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
}
/**
* confusion, especially since they most likely don't even
* know the message is being logged. */
$entry = sprintf('Could not log message details to Horde_History. Error returned: %s', $e->getMessage());
- Horde::logMessage($entry, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($entry, 'ERR');
}
}
}
}
if (count($quota) != 2) {
- Horde::logMessage('Incorrect number of return values from quota hook.', __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage('Incorrect number of return values from quota hook.', 'ERR');
throw new Horde_Exception(_("Unable to retrieve quota"));
}
$quota['limit'] = current($row);
}
} else {
- Horde::logMessage('IMP_Quota_Sql: query_quota SQL query not set', __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('IMP_Quota_Sql: query_quota SQL query not set', 'DEBUG');
}
if (!empty($this->_params['query_used'])) {
$quota['usage'] = current($row);
}
} else {
- Horde::logMessage('IMP_Quota_Sql: query_used SQL query not set', __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('IMP_Quota_Sql: query_used SQL query not set', 'DEBUG');
}
return $quota;
(int)$success);
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('IMP_Sentmail_Sql::_log(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('IMP_Sentmail_Sql::_log(): %s', $query), 'DEBUG');
/* Execute the query. */
$result = $this->_db->query($query, $values);
/* Log errors. */
if ($result instanceof PEAR_Error) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
}
}
$limit);
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('IMP_Sentmail_Sql::favouriteRecipients(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('IMP_Sentmail_Sql::favouriteRecipients(): %s', $query), 'DEBUG');
/* Execute the query. */
$recipients = $this->_db->getAll($query);
if ($recipients instanceof PEAR_Error) {
- Horde::logMessage($recipients, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($recipients, 'ERR');
throw new Horde_Exception_Prior($recipients);
}
}
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('IMP_Sentmail_Sql::numberOfRecipients(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('IMP_Sentmail_Sql::numberOfRecipients(): %s', $query), 'DEBUG');
/* Execute the query. */
$recipients = $this->_db->getOne($query, array(time() - $hours * 3600));
if ($recipients instanceof PEAR_Error) {
- Horde::logMessage($recipients, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($recipients, 'ERR');
throw new Horde_Exception_Prior($recipients);
}
$this->_params['table']);
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('IMP_Sentmail_Sql::_deleteOldEntries(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('IMP_Sentmail_Sql::_deleteOldEntries(): %s', $query), 'DEBUG');
/* Execute the query. */
$result = $this->_db->query($query, array($before));
if ($result instanceof PEAR_Error) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
}
}
2 => array('pipe', 'w')
), $pipes);
if (!is_resource($proc)) {
- Horde::logMessage('Cannot open process ' . $prog, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage('Cannot open process ' . $prog, 'ERR');
return 0;
}
stream_copy_to_stream($raw_msg, $pipes[0]);
}
fclose($pipes[2]);
if (!empty($stderr)) {
- Horde::logMessage('Error reporting spam: ' . $stderr, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage('Error reporting spam: ' . $stderr, 'ERR');
}
proc_close($proc);
$report_flag = true;
$imp_compose->sendMessage($to, $spam_headers, $mime, Horde_Nls::getCharset());
$report_flag = true;
} catch (IMP_Compose_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
}
}
$entry = sprintf("%s Redirected message sent to %s from %s",
$_SERVER['REMOTE_ADDR'], $recipients, Horde_Auth::getAuth());
- Horde::logMessage($entry, __FILE__, __LINE__, PEAR_LOG_INFO);
+ Horde::logMessage($entry, 'INFO');
if ($GLOBALS['conf']['sentmail']['driver'] != 'none') {
$sentmail = IMP_Sentmail::factory();
try {
$GLOBALS['ingo_storage']->removeUserData($user);
} catch (Ingo_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
throw new Horde_Auth_Exception($e);
}
/* Get the user's default share. */
$share = $GLOBALS['ingo_shares']->getShare($user);
if ($share instanceof PEAR_Error) {
- Horde::logMessage($share, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($share, 'ERR');
throw new Horde_Auth_Exception($share);
}
$result = $GLOBALS['ingo_shares']->removeShare($share);
if ($result instanceof PEAR_Error) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
throw new Horde_Auth_Exception($share);
}
* perms. */
$shares = $GLOBALS['ingo_shares']->listShares($user);
if ($shares instanceof PEAR_Error) {
- Horde::logMessage($shares, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($shares, 'ERR');
} else {
foreach ($shares as $share) {
$share->removeUser($user);
* and remove them. */
$shares = $GLOBALS['ingo_shares']->listShares($user, Horde_Perms::DELETE, $user);
if ($shares instanceof PEAR_Error) {
- Horde::logMessage($shares, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($shares, 'ERR');
throw new Horde_Auth_Exception($share);
}
*/
protected function _debug($sieve, $message)
{
- Horde::logMessage($message, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($message, 'DEBUG');
}
/**
{
$rulesets = $GLOBALS['ingo_shares']->listShares(Horde_Auth::getAuth(), $permission, $owneronly ? Horde_Auth::getAuth() : null);
if ($rulesets instanceof PEAR_Error) {
- Horde::logMessage($rulesets, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($rulesets, 'ERR');
return array();
}
$query = sprintf('SELECT * FROM %s WHERE rule_owner = ? ORDER BY rule_order',
$this->_params['table_rules']);
$values = array(Ingo::getUser());
- Horde::logMessage('Ingo_Storage_Filters_Sql(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Ingo_Storage_Filters_Sql(): ' . $query, 'DEBUG');
$result = $this->_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
return $result;
$values = array_merge(array($id, Ingo::getUser()),
$this->_ruleToBackend($rule),
array($order));
- Horde::logMessage('Ingo_Storage_Filters_Sql::addRule(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Ingo_Storage_Filters_Sql::addRule(): ' . $query, 'DEBUG');
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$this->_params['table_rules']);
$values = array_merge($this->_ruleToBackend($rule),
array($id, $rule['id'], Ingo::getUser()));
- Horde::logMessage('Ingo_Storage_Filters_Sql::updateRule(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Ingo_Storage_Filters_Sql::updateRule(): ' . $query, 'DEBUG');
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$query = sprintf('DELETE FROM %s WHERE rule_id = ? AND rule_owner = ?',
$this->_params['table_rules']);
$values = array($this->_filters[$id]['id'], Ingo::getUser());
- Horde::logMessage('Ingo_Storage_Filters_Sql::deleteRule(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Ingo_Storage_Filters_Sql::deleteRule(): ' . $query, 'DEBUG');
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
unset($this->_filters[$id]);
$query = sprintf('UPDATE %s SET rule_order = rule_order - 1 WHERE rule_owner = ? AND rule_order > ?',
$this->_params['table_rules']);
$values = array(Ingo::getUser(), $id);
- Horde::logMessage('Ingo_Storage_Filters_Sql::deleteRule(): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Ingo_Storage_Filters_Sql::deleteRule(): ' . $query, 'DEBUG');
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$values[] = (int)$id;
$values[] = (int)($id + $steps);
}
- Horde::logMessage('Ingo_Storage_Filters_Sql::ruleUp(): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Ingo_Storage_Filters_Sql::ruleUp(): ' . $query, 'DEBUG');
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$query = sprintf('UPDATE %s SET rule_order = ? WHERE rule_owner = ? AND rule_id = ?',
$values = array((int)($id + $steps),
Ingo::getUser(),
$this->_filters[$id]['id']);
- Horde::logMessage('Ingo_Storage_Filters_Sql::ruleUp(): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Ingo_Storage_Filters_Sql::ruleUp(): ' . $query, 'DEBUG');
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$this->_params['table_lists']);
$values = array(Ingo::getUser(),
(int)($field == self::ACTION_BLACKLIST));
- Horde::logMessage('Ingo_Storage_Sql::_retrieve(): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Ingo_Storage_Sql::_retrieve(): ' . $query, 'DEBUG');
$addresses = $this->_db->getCol($query, 0, $values);
if (is_a($addresses, 'PEAR_Error')) {
- Horde::logMessage($addresses, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($addresses, 'ERR');
return $addresses;
}
if ($field == self::ACTION_BLACKLIST) {
case self::ACTION_FORWARD:
$query = sprintf('SELECT * FROM %s WHERE forward_owner = ?',
$this->_params['table_forwards']);
- Horde::logMessage('Ingo_Storage_Sql::_retrieve(): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Ingo_Storage_Sql::_retrieve(): ' . $query, 'DEBUG');
$result = $this->_db->query($query, Ingo::getUser());
$data = $result->fetchRow(DB_FETCHMODE_ASSOC);
case self::ACTION_VACATION:
$query = sprintf('SELECT * FROM %s WHERE vacation_owner = ?',
$this->_params['table_vacations']);
- Horde::logMessage('Ingo_Storage_Sql::_retrieve(): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Ingo_Storage_Sql::_retrieve(): ' . $query, 'DEBUG');
$result = $this->_db->query($query, Ingo::getUser());
$data = $result->fetchRow(DB_FETCHMODE_ASSOC);
case self::ACTION_SPAM:
$query = sprintf('SELECT * FROM %s WHERE spam_owner = ?',
$this->_params['table_spam']);
- Horde::logMessage('Ingo_Storage_Sql::_retrieve(): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Ingo_Storage_Sql::_retrieve(): ' . $query, 'DEBUG');
$result = $this->_db->query($query, Ingo::getUser());
$data = $result->fetchRow(DB_FETCHMODE_ASSOC);
$query = sprintf('DELETE FROM %s WHERE list_owner = ? AND list_blacklist = ?',
$this->_params['table_lists']);
$values = array(Ingo::getUser(), $is_blacklist);
- Horde::logMessage('Ingo_Storage_Sql::_store(): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Ingo_Storage_Sql::_store(): ' . $query, 'DEBUG');
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$query = sprintf('INSERT INTO %s (list_owner, list_blacklist, list_address) VALUES (?, ?, ?)',
$this->_params['table_lists']);
- Horde::logMessage('Ingo_Storage_Sql::_store(): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Ingo_Storage_Sql::_store(): ' . $query, 'DEBUG');
$addresses = $is_blacklist ? $ob->getBlacklist() : $ob->getWhitelist();
foreach ($addresses as $address) {
$result = $this->_write_db->query($query,
$is_blacklist,
$address));
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
}
implode("\n", $ob->getForwardAddresses()),
(int)(bool)$ob->getForwardKeep(),
Ingo::getUser());
- Horde::logMessage('Ingo_Storage_Sql::_store(): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Ingo_Storage_Sql::_store(): ' . $query, 'DEBUG');
$ret = $this->_write_db->query($query, $values);
if (!is_a($ret, 'PEAR_Error')) {
$ob->setSaved(true);
implode("\n", $ob->getVacationExcludes()),
(int)(bool)$ob->getVacationIgnorelist(),
Ingo::getUser());
- Horde::logMessage('Ingo_Storage_Sql::_store(): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Ingo_Storage_Sql::_store(): ' . $query, 'DEBUG');
$ret = $this->_write_db->query($query, $values);
if (!is_a($ret, 'PEAR_Error')) {
$ob->setSaved(true);
(int)$ob->getSpamLevel(),
$ob->getSpamFolder(),
Ingo::getUser());
- Horde::logMessage('Ingo_Storage_Sql::_store(): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Ingo_Storage_Sql::_store(): ' . $query, 'DEBUG');
$ret = $this->_write_db->query($query, $values);
if (!is_a($ret, 'PEAR_Error')) {
$ob->setSaved(true);
$values = array($user);
foreach ($queries as $query) {
- Horde::logMessage('Ingo_Storage_sql::removeUserData(): ' . $query, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Ingo_Storage_sql::removeUserData(): ' . $query, 'DEBUG');
$result = $this->_write_db->query($query, $values);
if ($result instanceof PEAR_Error) {
throw new Ingo_Exception($result);
$query[$key] = $value;
} elseif ($line == "\n") {
if (empty($query['request']) || $query['request'] != 'smtpd_access_policy') {
- Horde::logMessage('Unrecognized request: ' . substr(var_export($query, true), 0, 200), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage('Unrecognized request: ' . substr(var_export($query, true), 0, 200), 'ERR');
exit(1);
}
- Horde::logMessage(var_export($query, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(var_export($query, true), 'DEBUG');
$action = smtpd_access_policy($query);
- Horde::logMessage("Action: $action", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage("Action: $action", 'DEBUG');
echo "action=$action\n\n";
@ob_flush();
$query = array();
} else {
- Horde::logMessage('Ignoring garbage: ' . substr($line, 0, 100), __FILE__, __LINE__, PEAR_LOG_INFO);
+ Horde::logMessage('Ignoring garbage: ' . substr($line, 0, 100), 'INFO');
}
}
}
}
} catch (Exception $e) {
- Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($e, 'DEBUG');
}
}
return $global;
if (!$this->koward->hasAccess($id, $permission)) {
$this->koward->notification->push(_("Access denied."), 'horde.error');
- Horde::logMessage(sprintf('User %s does not have access to action %s!', Horde_Auth::getAuth(), $id),
- __FILE__, __LINE__, PEAR_LOG_NOTICE);
+ Horde::logMessage(sprintf('User %s does not have access to action %s!', Horde_Auth::getAuth(), $id), 'NOTICE');
if (Horde_Auth::getAuth()) {
$url = $this->urlFor(array('controller' => 'index', 'action' => 'index'));
} else {
$this->title = _("Login");
- $this->post = $this->urlFor(array('controller' => 'index',
+ $this->post = $this->urlFor(array('controller' => 'index',
'action' => 'login'));
if (isset($_POST['horde_user']) && isset($_POST['horde_pass'])) {
array('password' => Horde_Util::getPost('horde_pass')))) {
$entry = sprintf('Login success for %s [%s] to Horde',
Horde_Auth::getAuth(), $_SERVER['REMOTE_ADDR']);
- Horde::logMessage($entry, __FILE__, __LINE__, PEAR_LOG_NOTICE);
+ Horde::logMessage($entry, 'NOTICE');
$type = $this->koward->getType();
if (!empty($type) && isset($this->koward->objects[$type]['default_view'])) {
} else {
$entry = sprintf('FAILED LOGIN for %s [%s] to Horde',
Horde_Util::getFormData('horde_user'), $_SERVER['REMOTE_ADDR']);
- Horde::logMessage($entry, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($entry, 'ERR');
}
}
{
$entry = sprintf('User %s [%s] logged out of Horde',
Horde_Auth::getAuth(), $_SERVER['REMOTE_ADDR']);
- Horde::logMessage($entry, __FILE__, __LINE__, PEAR_LOG_NOTICE);
+ Horde::logMessage($entry, 'NOTICE');
Horde_Auth::clearAuth();
@session_destroy();
$conf['kolab']['enabled'] = true;
$conf['kolab']['server']['driver'] = 'ldap';
$conf['kolab']['imap']['allow_special_users'] = true;
-$conf['log']['priority'] = PEAR_LOG_DEBUG;
+$conf['log']['priority'] = 'DEBUG';
$conf['log']['ident'] = 'HORDE';
$conf['log']['params'] = array();
$conf['log']['name'] = '/tmp/horde.log';
} catch (Exception $e) {
global $notification, $registry;
- Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($e, 'DEBUG');
if (isset($notification)) {
$notification->push($e->getMessage(), 'horde.error');
try {
$fb = Kronolith_FreeBusy::generate(explode('|', $cal), null, null, false, $user);
} catch (Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
exit;
}
$cache->set($key, $fb);
new Horde_Date($startDate),
array($calendar));
} catch (Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
$events = array();
}
try {
$res = $GLOBALS['registry']->call('contacts/search', array($search, $src, $fields, true));
} catch (Horde_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
return array();
}
$result = $GLOBALS['kronolith_shares']->removeShare($share);
if ($result instanceof PEAR_Error) {
$hasError = true;
- Horde::logMessage($result->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
}
} catch (Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
}
/* Get a list of all shares this user has perms to and remove the
* perms */
$shares = $GLOBALS['kronolith_shares']->listShares($user);
if ($shares instanceof PEAR_Error) {
- Horde::logMessage($shares, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($shares, 'ERR');
}
foreach ($shares as $share) {
$share->removeUser($user);
$json = false, $coverDates = true)
{
if (!class_exists('Date_Holidays')) {
- Horde::logMessage('Support for Date_Holidays has been enabled but the package seems to be missing.',
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage('Support for Date_Holidays has been enabled but the package seems to be missing.', 'ERR');
return array();
}
$dh = Date_Holidays::factory($this->calendar, $year, $this->_params['language']);
if (Date_Holidays::isError($dh)) {
Horde::logMessage(sprintf('Factory was unable to produce driver object for driver %s in year %s with locale %s',
- $this->calendar, $year, $this->_params['language']),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ $this->calendar, $year, $this->_params['language']), 'ERR');
continue;
}
$dh->addTranslation($this->_params['language']);
$dh = Date_Holidays::factory($this->calendar, $year, $this->_params['language']);
if (Date_Holidays::isError($dh)) {
Horde::logMessage(sprintf('Factory was unable to produce driver object for driver %s in year %s with locale %s',
- $this->calendar, $year, $this->_params['language']),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ $this->calendar, $year, $this->_params['language']), 'ERR');
return false;
}
$dh->addTranslation($this->_params['language']);
try {
$response = $http->get($url);
} catch (Horde_Http_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_INFO);
+ Horde::logMessage($e, 'INFO');
$_SESSION['kronolith']['remote'][$signature] = $e->getMessage();
throw new Kronolith_Exception($e);
}
if ($response->code != 200) {
Horde::logMessage(sprintf('Failed to retrieve remote calendar: url = "%s", status = %s',
- $url, $response->code),
- __FILE__, __LINE__, PEAR_LOG_INFO);
+ $url, $response->code), 'INFO');
$_SESSION['kronolith']['remote'][$signature] = sprintf(_("Could not open %s."), $url);
throw new Kronolith_Exception($_SESSION['kronolith']['remote'][$signature], $response->code);
}
/* Log fetch at DEBUG level. */
Horde::logMessage(sprintf('Retrieved remote calendar for %s: url = "%s"',
- Horde_Auth::getAuth(), $url),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde_Auth::getAuth(), $url), 'DEBUG');
$data = $response->getBody();
$_SESSION['kronolith']['remote'][$signature] = new Horde_iCalendar();
{
// Log error if someone uses this function in an unsupported way
if ($calendar_id != $this->calendar) {
- Horde::logMessage(sprintf("Kolab::exists called for calendar %s. Currently active is %s.", $calendar_id, $this->calendar), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage(sprintf("Kolab::exists called for calendar %s. Currently active is %s.", $calendar_id, $this->calendar), 'ERR');
throw new Kronolith_Exception(sprintf("Kolab::exists called for calendar %s. Currently active is %s.", $calendar_id, $this->calendar));
}
/* Log the query at a DEBUG log level. */
Horde::logMessage(sprintf('Kronolith_Driver_Sql::exists(): user = "%s"; query = "%s"',
- Horde_Auth::getAuth(), $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde_Auth::getAuth(), $query), 'DEBUG');
$event = $this->_db->getRow($query, $values, DB_FETCHMODE_ASSOC);
$this->handleError($event);
/* Log the query at a DEBUG log level. */
Horde::logMessage(sprintf('Kronolith_Driver_Sql::_listEventsConditional(): user = "%s"; query = "%s"; values = "%s"',
- Horde_Auth::getAuth(), $q, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde_Auth::getAuth(), $q, implode(',', $values)), 'DEBUG');
/* Run the query. */
$qr = $this->_db->query($q, $values);
/* Log the query at a DEBUG log level. */
Horde::logMessage(sprintf('Kronolith_Driver_Sql::_listEventsConditional(): user = %s; query = "%s"; values = "%s"',
- Horde_Auth::getAuth(), $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde_Auth::getAuth(), $query, implode(',', $values)), 'DEBUG');
$result = $this->_write_db->query($query, $values);
if ($result instanceof PEAR_Error) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
}
}
$this->_params['table']);
/* Log the query at a DEBUG log level. */
Horde::logMessage(sprintf('Kronolith_Driver_Sql::_countEvents(): user = "%s"; query = "%s"; values = "%s"',
- Horde_Auth::getAuth(), $query, $this->calendar),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde_Auth::getAuth(), $query, $this->calendar), 'DEBUG');
/* Run the query. */
$result = $this->_db->getOne($query, array($this->calendar));
/* Log the query at a DEBUG log level. */
Horde::logMessage(sprintf('Kronolith_Driver_Sql::getEvent(): user = "%s"; query = "%s"; values = "%s"',
- Horde_Auth::getAuth(), $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde_Auth::getAuth(), $query, implode(',', $values)), 'DEBUG');
$event = $this->_db->getRow($query, $values, DB_FETCHMODE_ASSOC);
$this->handleError($event);
/* Log the query at a DEBUG log level. */
Horde::logMessage(sprintf('Kronolith_Driver_Sql::getByUID(): user = "%s"; query = "%s"; values = "%s"',
- Horde_Auth::getAuth(), $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde_Auth::getAuth(), $query, implode(',', $values)), 'DEBUG');
$events = $this->_db->getAll($query, $values, DB_FETCHMODE_ASSOC);
$this->handleError($events);
/* Log the query at a DEBUG log level. */
Horde::logMessage(sprintf('Kronolith_Driver_Sql::saveEvent(): user = "%s"; query = "%s"; values = "%s"',
- Horde_Auth::getAuth(), $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde_Auth::getAuth(), $query, implode(',', $values)), 'DEBUG');
$result = $this->_write_db->query($query, $values);
$this->handleError($result);
/* Log the query at a DEBUG log level. */
Horde::logMessage(sprintf('Kronolith_Driver_Sql::saveEvent(): user = "%s"; query = "%s"; values = "%s"',
- Horde_Auth::getAuth(), $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde_Auth::getAuth(), $query, implode(',', $values)), 'DEBUG');
$result = $this->_write_db->query($query, $values);
$this->handleError($result);
/* Log the query at a DEBUG log level. */
Horde::logMessage(sprintf('Kronolith_Driver_Sql::move(): %s; values = "%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
/* Attempt the move query. */
$result = $this->_write_db->query($query, $values);
/* Log the query at a DEBUG log level. */
Horde::logMessage(sprintf('Kronolith_Driver_Sql::delete(): user = "%s"; query = "%s"; values = "%s"',
- Horde_Auth::getAuth(), $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde_Auth::getAuth(), $query, implode(',', $values)), 'DEBUG');
$result = $this->_write_db->query($query, $values);
$this->handleError($result);
/* Log the query at a DEBUG log level. */
Horde::logMessage(sprintf('Kronolith_Driver_Sql::deleteEvent(): user = "%s"; query = "%s"; values = "%s"',
- Horde_Auth::getAuth(), $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde_Auth::getAuth(), $query, implode(',', $values)), 'DEBUG');
$result = $this->_write_db->query($query, $values);
$this->handleError($result);
. 'AND event_uid IN (' . str_repeat('?,', count($uids) - 1) . '?)';
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Kronolith_Driver_Sql::filterEventsByCalendar(): %s', $sql),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Kronolith_Driver_Sql::filterEventsByCalendar(): %s', $sql), 'DEBUG');
$result = $this->_db->getCol($sql, 0, array_merge($calendar, $uids));
$this->handleError($result);
/* Log the query at a DEBUG log level. */
Horde::logMessage(sprintf('Kronolith_Driver_Sql::_initConn(): user = "%s"; query = "%s"',
- Horde_Auth::getAuth(), $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde_Auth::getAuth(), $query), 'DEBUG');
$db->query($query);
break;
/* Log the query at a DEBUG log level. */
Horde::logMessage(sprintf('Kronolith_Driver_Sql::_initConn(): user = "%s"; query = "%s"',
- Horde_Auth::getAuth(), $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde_Auth::getAuth(), $query), 'DEBUG');
$db->query($query);
break;
protected function handleError($result)
{
if ($result instanceof PEAR_Error) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
throw new Kronolith_Exception($result);
}
}
$sql = 'SELECT COUNT(*) FROM kronolith_events_geo WHERE event_id = ?';
$count = $this->_db->getOne($sql, array($event_id));
if ($count instanceof PEAR_Error) {
- Horde::logMessage($count, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($count, 'ERR');
throw new Horde_Exception($count);
}
}
$result = $this->_write_db->query($sql, array($event_id));
if ($result instanceof PEAR_Error) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
throw new Horde_Exception($result);
}
$sql = 'SELECT x(event_coordinates) as lat, y(event_coordinates) as lon FROM kronolith_events_geo WHERE event_id = ?';
$result = $this->_db->getRow($sql, array($event_id), DB_FETCHMODE_ASSOC);
if ($result instanceof PEAR_Error) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
throw new Horde_Exception($result);
}
return $result;
$results = $this->_db->getAssoc($sql, false, $params, DB_FETCHMODE_ASSOC);
if ($results instanceof PEAR_Error) {
- Horde::logMessage($results, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($results, 'ERR');
throw new Horde_Exception($results);
}
$sql = 'SELECT COUNT(*) FROM kronolith_events_geo WHERE event_id = ?';
$count = $this->_db->getOne($sql, array($event_id));
if ($count instanceof PEAR_Error) {
- Horde::logMessage($count, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($count, 'ERR');
throw new Horde_Exception($count);
}
}
$result = $this->_write_db->query($sql, $params);
if ($result instanceof PEAR_Error) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
throw new Horde_Exception($result);
}
$sql = 'SELECT event_lat as lat, event_lon as lon FROM kronolith_events_geo WHERE event_id = ?';
$result = $this->_db->getRow($sql, array($event_id), DB_FETCHMODE_ASSOC);
if ($result instanceof PEAR_Error) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
throw new Horde_Exception($result);
}
$sql = 'DELETE FROM kronolith_events_geo WHERE event_id = ?';
$result = $this->_write_db->query($sql, array($event_id));
if ($result instanceof PEAR_Error) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
throw new Horde_Exception($result);
}
}
{
throw new Horde_Exception(_("Searching requires a GIS enabled database."));
}
-}
\ No newline at end of file
+}
try {
$categories = $GLOBALS['registry']->call($api . '/listTimeObjectCategories');
} catch (Horde_Exception $e) {
- Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($e, 'DEBUG');
continue;
}
$calendars = $GLOBALS['kronolith_shares']->listShares(Horde_Auth::getAuth(), $permission, $owneronly ? Horde_Auth::getAuth() : null, 0, 0, 'name');
if ($calendars instanceof PEAR_Error) {
- Horde::logMessage($calendars, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($calendars, 'ERR');
return array();
}
}
$group_users = $group->listAllUsers();
if ($group_users instanceof PEAR_Error) {
- Horde::logMessage($group_users, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($group_users, 'ERR');
continue;
}
foreach ($group_users as $user) {
'charset' => Horde_Nls::getCharset()));
$mime_mail->addHeader('User-Agent', 'Kronolith ' . $GLOBALS['registry']->getVersion());
$mime_mail->setBody($message, Horde_Nls::getCharset(), true);
- Horde::logMessage(sprintf('Sending event notifications for %s to %s', $event->title, implode(', ', $df_recipients)), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Sending event notifications for %s to %s', $event->title, implode(', ', $df_recipients)), 'DEBUG');
$mime_mail->send(Horde::getMailerConfig(), false, false);
}
}
try {
return Kronolith_Geo::factory($GLOBALS['conf']['maps']['geodriver']);
} catch (Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
}
}
return false;
$kronolith_driver->deleteEvent($event->id, true);
++$count;
} catch (Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
throw $e;
}
}
/* Log the query at debug level. */
Horde::logMessage(sprintf('SQL search by %s: query = "%s"',
- Horde_Auth::getAuth(), $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde_Auth::getAuth(), $query), 'DEBUG');
/* Execute the query. */
$result = $this->_db->query($query, $values);
/* Log the query at debug level. */
Horde::logMessage(sprintf('SQL insert by %s: query = "%s"',
- Horde_Auth::getAuth(), $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde_Auth::getAuth(), $query), 'DEBUG');
/* Execute the query. */
$result = $this->_write_db->query($query, $values);
protected function handleError($result)
{
if ($result instanceof PEAR_Error) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
throw new Kronolith_Exception($result);
}
}
try {
$userList = $auth->listUsers();
} catch (Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
$userList = array();
}
sort($userList);
$groupList = $groups->getGroupMemberships(Horde_Auth::getAuth(), true);
}
if ($groupList instanceof PEAR_Error) {
- Horde::logMessage($groupList, __FILE__, __LINE__, PEAR_LOG_NOTICE);
+ Horde::logMessage($groupList, 'NOTICE');
$groupList = array();
}
asort($groupList);
try {
$mime_mail->addRecipients($email);
} catch (Horde_Mime_Exception $e) {}
- Horde::logMessage(sprintf('Sending daily agenda to %s', $email),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Sending daily agenda to %s', $email), 'DEBUG');
try {
$mime_mail->send(Horde::getMailerConfig(), false, false);
} catch (Horde_Mime_Exception $e) {}
/* Get the share for later deletion */
$share = $GLOBALS['nag_shares']->getShare($user);
if(is_a($share, 'PEAR_Error')) {
- Horde::logMessage($share->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($share, 'ERR');
unset($share);
} else {
/* Get the list of all tasks */
$tasks = Nag::listTasks(null, null, null, $user, 1);
if (is_a($tasks, 'PEAR_Error')) {
$hasError = true;
- Horde::logMessage($share->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($share, 'ERR');
} else {
$uids = array();
$tasks->reset();
$result = $GLOBALS['nag_shares']->removeShare($share);
if (is_a($result, 'PEAR_Error')) {
$hasError = true;
- Horde::logMessage($result->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
}
}
$shares = $GLOBALS['nag_shares']->listShares($user);
if (is_a($shares, 'PEAR_Error')) {
$hasError = true;
- Horde::logMessage($shares, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($shares, 'ERR');
}
foreach ($shares as $share) {
$share->removeUser($user);
/* Notify users about the new event. */
$result = Nag::sendNotification('add', $task);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
}
/* Add an alarm if necessary. */
/* Notify users about the changed event. */
$result = Nag::sendNotification('edit', $new_task, $task);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
}
return true;
/* Notify users about the deleted event. */
$result = Nag::sendNotification('delete', $task);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
}
/* Delete alarm if necessary. */
$values = array($this->_tasklist, $taskId);
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Nag_Driver_Sql::get(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Nag_Driver_Sql::get(): %s', $query), 'DEBUG');
/* Execute the query. */
$result = $this->_db->query($query, $values);
$values = array($uid);
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Nag_Driver_Sql::getByUID(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Nag_Driver_Sql::getByUID(): %s', $query), 'DEBUG');
/* Execute the query. */
$result = $this->_db->query($query, $values);
$parent);
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Nag_Driver_Sql::_add(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Nag_Driver_Sql::_add(): %s', $query), 'DEBUG');
/* Attempt the insertion query. */
$result = $this->_write_db->query($query, $values);
/* Return an error immediately if the query failed. */
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$taskId);
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Nag_Driver_Sql::modify(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Nag_Driver_Sql::modify(): %s', $query), 'DEBUG');
/* Attempt the update query. */
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$values = array($newTasklist, $this->_tasklist, $taskId);
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Nag_Driver_Sql::move(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Nag_Driver_Sql::move(): %s', $query), 'DEBUG');
/* Attempt the move query. */
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$values = array($this->_tasklist, $taskId);
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Nag_Driver_Sql::delete(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Nag_Driver_Sql::delete(): %s', $query), 'DEBUG');
/* Attempt the delete query. */
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$values = array($this->_tasklist);
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Nag_Driver_Sql::deleteAll(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Nag_Driver_Sql::deleteAll(): %s', $query), 'DEBUG');
/* Attempt the delete query. */
$result = $this->_write_db->query($query, $values);
}
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Nag_Driver_Sql::retrieve(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Nag_Driver_Sql::retrieve(): %s', $query), 'DEBUG');
/* Execute the query. */
$result = $this->_db->query($query, $values);
$values = array($this->_tasklist, $parentId);
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Nag_Driver_Sql::getChildren(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Nag_Driver_Sql::getChildren(): %s', $query), 'DEBUG');
/* Execute the query. */
$result = $this->_db->query($query, $values);
/* Log the query at a DEBUG log level. */
Horde::logMessage(sprintf('SQL alarms list by %s: table = %s; query = "%s"',
- Horde_Auth::getAuth(), $this->_params['table'], $q),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde_Auth::getAuth(), $this->_params['table'], $q), 'DEBUG');
/* Run the query. */
$result = $this->_db->query($q, $values);
$values = array($row['task_uid'], $row['task_owner'], $row['task_id']);
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Nag_Driver_Sql adding missing UID: %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Nag_Driver_Sql adding missing UID: %s', $query), 'DEBUG');
$this->_write_db->query($query, $values);
}
if (!empty($types['taskHash'])) {
$newtasks = $registry->callByPackage($app, 'listAs', array('taskHash'));
if (is_a($newtasks, 'PEAR_Error')) {
- Horde::logMessage($newtasks, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($newtasks, 'ERR');
} else {
foreach ($newtasks as $task) {
$task['tasklist_id'] = '**EXTERNAL**';
}
$tasklists = $GLOBALS['nag_shares']->listShares(Horde_Auth::getAuth(), $permission, $owneronly ? Horde_Auth::getAuth() : null, 0, 0, 'name');
if (is_a($tasklists, 'PEAR_Error')) {
- Horde::logMessage($tasklists, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($tasklists, 'ERR');
return array();
}
$now = time();
$alarmList = Nag::listAlarms($now);
if (is_a($alarmList, 'PEAR_Error')) {
- Horde::logMessage($alarmList, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($alarmList, 'ERR');
$notification->push($alarmList, 'horde.error');
} else {
$messages = array();
}
$group_users = $group->listAllUsers();
if (is_a($group_users, 'PEAR_Error')) {
- Horde::logMessage($group_users, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($group_users, 'ERR');
continue;
}
foreach ($group_users as $user) {
$mail->addRecipients($df_recipients);
Horde::logMessage(sprintf('Sending event notifications for %s to %s',
- $task->name, implode(', ', $df_recipients)),
- __FILE__, __LINE__, PEAR_LOG_INFO);
+ $task->name, implode(', ', $df_recipients)), 'INFO');
$sent = $mail->send(Horde::getMailerConfig());
if (is_a($sent, 'PEAR_Error')) {
return $sent;
{
$new_id = $this->_write_db->nextId('news_categories');
if ($new_id instanceof PEAR_Error) {
- Horde::logMessage($new_id, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($new_id, 'ERR');
return $new_id;
}
$category = $this->_write_db->query($sql, $values);
if ($category instanceof PEAR_Error) {
- Horde::logMessage($category, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($category, 'ERR');
return $category;
}
$data['category_description_' . $lang]);
$result = $this->_write_db->query($sql, $values);
if ($result instanceof PEAR_Error) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
}
$category = $this->_write_db->query($sql, $values);
if ($category instanceof PEAR_Error) {
- Horde::logMessage($category, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($category, 'ERR');
return $category;
}
$source = $this->write_db->query($sql, $values);
if ($source instanceof PEAR_Error) {
- Horde::logMessage($source, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($source, 'ERR');
return $source;
}
$source = $this->write_db->query($sql, $values);
if ($source instanceof PEAR_Error) {
- Horde::logMessage($source, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($source, 'ERR');
return $source;
}
}
try {
$pdf->image($file, 120, 20);
} catch (Horde_Pdf_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_INFO);
+ Horde::logMessage($e, 'INFO');
}
}
$values = array();
if (!is_numeric($rowstart)) {
- Horde::logMessage('Invalid start row requested.', __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage('Invalid start row requested.', 'ERR');
throw new Operator_Exception(_("Internal error. Details have been logged for the administrator."));
}
if (!is_null($rowlimit) && !is_numeric($rowlimit)) {
- Horde::logMessage('Invalid row limit requested.', __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage('Invalid row limit requested.', 'ERR');
throw new Operator_Exception(_("Internal error. Details have been logged for the administrator."));
}
$filterstring = implode(' AND ', $filter);
$sql = sprintf($sql, $filterstring);
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Operator_Driver_asterisksql::getData(): %s', $sql), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Operator_Driver_asterisksql::getData(): %s', $sql), 'DEBUG');
/* Execute the query. */
if (is_null($rowlimit)) {
$res = $this->_db->limitQuery($sql, $rowstart, $rowlimit, $values);
}
if (is_a($res, 'PEAR_Error')) {
- Horde::logMessage($res, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($res, 'ERR');
throw new Operator_Exception(_("Internal error. Details have been logged for the administrator."));
}
'SUM(CASE disposition WHEN "FAILED" THEN 1 ELSE 0 END) AS ' .
'failed FROM ' . $this->_params['table'] . ' WHERE %s';
$sql = sprintf($sql, $filterstring);
- Horde::logMessage(sprintf('Operator_Driver_asterisksql::getData(): %s', $sql), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Operator_Driver_asterisksql::getData(): %s', $sql), 'DEBUG');
/* Execute the query. */
$res = $this->_db->getRow($sql, $values, DB_FETCHMODE_ASSOC);
if (is_a($res, 'PEAR_Error')) {
- Horde::logMessage($res, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($res, 'ERR');
throw new Operator_Exception(_("Internal error. Details have been logged for the administrator."));
}
$dcontext = null)
{
if (!is_a($start, 'Horde_Date') || !is_a($end, 'Horde_Date')) {
- Horde::logMessage('Start ane end date must be Horde_Date objects.', __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage('Start ane end date must be Horde_Date objects.', 'ERR');
throw new Operator_Exception(_("Internal error. Details have been logged for the administrator."));
}
/* Log the query at a DEBUG log level. */
$sql = sprintf($numcalls_query, $filterstring);
- Horde::logMessage(sprintf('Operator_Driver_asterisksql::getCallStats(): Values: %s', print_r($values, true)), __FILE__, __LINE__, PEAR_LOG_DEBUG);
- Horde::logMessage(sprintf('Operator_Driver_asterisksql::getCallStats(): %s', $sql), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Operator_Driver_asterisksql::getCallStats(): Values: %s', print_r($values, true)), 'DEBUG');
+ Horde::logMessage(sprintf('Operator_Driver_asterisksql::getCallStats(): %s', $sql), 'DEBUG');
$numcalls_res = $this->_db->getAll($sql, $values, DB_FETCHMODE_ASSOC);
if (is_a($numcalls_res, 'PEAR_Error')) {
- Horde::logMessage($numcalls_res, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($numcalls_res, 'ERR');
throw new Operator_Exception(_("Internal error. Details have been logged for the administrator."));
}
$sql = sprintf($minutes_query, $filterstring);
- Horde::logMessage(sprintf('Operator_Driver_asterisksql::getCallStats(): %s', $sql), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Operator_Driver_asterisksql::getCallStats(): %s', $sql), 'DEBUG');
$minutes_res = $this->_db->getAll($sql, $values, DB_FETCHMODE_ASSOC);
if (is_a($minutes_res, 'PEAR_Error')) {
- Horde::logMessage($minutes_res, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($minutes_res, 'ERR');
throw new Operator_Exception(_("Internal error. Details have been logged for the administrator."));
}
$sql = sprintf($failed_query, $filterstring);
- Horde::logMessage(sprintf('Operator_Driver_asterisksql::getCallStats(): %s', $sql), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Operator_Driver_asterisksql::getCallStats(): %s', $sql), 'DEBUG');
$failed_res = $this->_db->getAll($sql, $values, DB_FETCHMODE_ASSOC);
if (is_a($failed_res, 'PEAR_Error')) {
- Horde::logMessage($failed_res, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($failed_res, 'ERR');
throw new Operator_Exception(_("Internal error. Details have been logged for the administrator."));
}
$sql = 'SELECT DISTINCT(accountcode) FROM ' . $this->_params['table'] .
' ORDER BY accountcode';
- Horde::logMessage(sprintf('Operator_Driver_asterisksql::getAccountCodes(): %s', $sql), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Operator_Driver_asterisksql::getAccountCodes(): %s', $sql), 'DEBUG');
$res = $this->_db->getCol($sql, 'accountcode');
if (is_a($res, 'PEAR_Error')) {
- Horde::logMessage($res, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($res, 'ERR');
throw new Operator_Exception(_("Internal error. Details have been logged for the administrator."));
}
$res = $cache->set($cachekey, serialize($stats), 600);
if ($res === false) {
- Horde::logMessage('The cache system has experienced an error. Unable to continue.', __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage('The cache system has experienced an error. Unable to continue.', 'ERR');
$notification->push(_("Internal error. Details have been logged for the administrator."));
$stats = array();
}
return $shout->extensions->getExtensions($account);
} catch (Exception $e) {
//FIXME: Create a way to notify the user of the failure.
- Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
return false;
}
}
return $shout->extensions->getExtensions($account);
} catch (Exception $e) {
//FIXME: Create a way to notify the user of the failure.
- Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
return false;
}
}
return $shout->extensions->getExtensions($account);
} catch (Exception $e) {
//FIXME: Create a way to notify the user of the failure.
- Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
return false;
}
}
$menus = $shout->storage->getMenus($account);
$menu = $vars->menu;
if (!isset($menus[$menu])) {
- Horde::logMessage("User requested a menu that does not exist.", __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage("User requested a menu that does not exist.", 'ERR');
//$GLOBALS['notification']->push(_("That menu does not exist."), 'horde.error');
// FIXME notifications
return false;
} catch (Exception $e) {
//FIXME: Create a way to notify the user of the failure.
die(var_dump($e));
- Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
return false;
}
}
return $actions;
} catch (Exception $e) {
//FIXME: Create a way to notify the user of the failure.
- Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
return false;
}
}
} catch (Exception $e) {
//FIXME: Create a way to notify the user of the failure.
- Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
return false;
}
}
$shout->dialplan->saveMenuAction($account, $menu, $digit, $action, $args);
} catch (Exception $e) {
//FIXME: Create a way to notify the user of the failure.
- Horde::logMessage($e->getMessage(), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
return false;
}
}
if ($res === false) {
$msg = sprintf('Error while modifying the LDAP entry. Code %s; Message "%s"',
ldap_errno($this->_LDAP), ldap_error($this->_LDAP));
- Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($msg, 'ERR');
throw new Shout_Exception(_("Internal error modifing the directory. Details have been logged for the administrator."));
}
if ($res === false) {
$msg = sprintf('Error while searching LDAP. Code %s; Message "%s"',
ldap_errno($this->_LDAP), ldap_error($this->_LDAP));
- Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($msg, 'ERR');
throw new Shout_Exception(_("Internal error searching the directory."));
}
if ($res === false) {
$msg = sprintf('Error while searching LDAP. Code %s; Message "%s"',
ldap_errno($this->_LDAP), ldap_error($this->_LDAP));
- Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($msg, 'ERR');
throw new Shout_Exception(_("Internal error searching the directory."));
}
if ($res['count'] != 1) {
$msg = sprintf('Error while searching LDAP. Code %s; Message "%s"',
ldap_errno($this->_LDAP), ldap_error($this->_LDAP));
- Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($msg, 'ERR');
throw new Shout_Exception(_("Wrong number of entries found for this search."));
}
if ($res === false) {
$msg = sprintf('Error while modifying the LDAP entry. Code %s; Message "%s"',
ldap_errno($this->_LDAP), ldap_error($this->_LDAP));
- Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($msg, 'ERR');
throw new Shout_Exception(_("Internal error modifing the directory. Details have been logged for the administrator."));
}
// if ($res === false) {
// $msg = sprintf('LDAP Error (%s): %s', ldap_errno($this->_LDAP),
// ldap_error($this->_LDAP));
-// Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_ERR);
+// Horde::logMessage($msg, 'ERR');
// throw new Shout_Exception(_("Error while searching the directory. Details have been logged for the administrator."));
// }
// if (($res['count'] != 1) ||
if ($res === false) {
$msg = sprintf('LDAP Error (%s): %s', ldap_errno($this->_LDAP),
ldap_error($this->_LDAP));
- Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($msg, 'ERR');
throw new Shout_Exception(_("Error while modifying the directory. Details have been logged for the administrator."));
}
}
if ($res === false) {
$msg = sprintf('LDAP Error (%s): %s', ldap_errno($this->_LDAP),
ldap_error($this->_LDAP));
- Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($msg, 'ERR');
throw new Shout_Exception(_("Error while modifying the directory. Details have been logged for the administrator."));
}
if ($res === false) {
$msg = sprintf('LDAP Error (%s): %s', ldap_errno($this->_LDAP),
ldap_error($this->_LDAP));
- Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($msg, 'ERR');
throw new Shout_Exception(_("Error while modifying the directory. Details have been logged for the administrator."));
}
return true;
if ($res === false) {
$msg = sprintf('LDAP Error (%s): %s', ldap_errno($this->_LDAP),
ldap_error($this->_LDAP));
- Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($msg, 'ERR');
throw new Horde_Exception(_("Error while deleting from the directory. Details have been logged for the administrator."));
}
if ($res === false) {
$msg = sprintf('LDAP Error (%s): %s', ldap_errno($this->_LDAP),
ldap_error($this->_LDAP));
- Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($msg, 'ERR');
throw new Shout_Exception(_("Error while searching the directory. Details have been logged for the administrator."));
}
if ($res === false) {
$msg = sprintf('LDAP Error (%s): %s', ldap_errno($this->_LDAP),
ldap_error($this->_LDAP));
- Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($msg, 'ERR');
throw new Shout_Exception(_("Error while searching the directory. Details have been logged for the administrator."));
}
if ($dn === false) {
$msg = sprintf('LDAP Error (%s): %s', ldap_errno($this->_LDAP),
ldap_error($this->_LDAP));
- Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($msg, 'ERR');
throw new Shout_Exception(_("Internal LDAP error. Details have been logged for the administrator."));
}
if (!$conn) {
Horde::logMessage(
sprintf('Failed to open an LDAP connection to %s.',
- $this->_params['hostspec']),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ $this->_params['hostspec']), 'ERR');
throw new Shout_Exception('Internal LDAP error. Details have been logged for the administrator.');
}
sprintf('Set LDAP protocol version to %d failed: [%d] %s',
$this->_params['version'],
ldap_errno($conn),
- ldap_error($conn)),
- __FILE__, __LINE__, PEAR_LOG_WARNING);
+ ldap_error($conn)), 'WARN');
throw new Shout_Exception('Internal LDAP error. Details have been logged for the administrator.', ldap_errno($conn));
}
}
Horde::logMessage(
sprintf('STARTTLS failed: [%d] %s',
@ldap_errno($this->_ds),
- @ldap_error($this->_ds)),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ @ldap_error($this->_ds)), 'ERR');
}
}
$this->_params['port'],
$this->_params['searchdn'],
@ldap_errno($conn),
- @ldap_error($conn)),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ @ldap_error($conn)), 'ERR');
throw new Shout_Exception('Internal LDAP error. Details have been logged for the administrator.', ldap_errno($conn));
}
}
$vars = array();
$msg = 'SQL query in Shout_Driver_Sql#getAccounts(): ' . $sql;
- Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($msg, 'DEBUG');
$result = $this->_db->query($sql, $vars);
if ($result instanceof PEAR_Error) {
throw new Shout_Exception($result);
$values = array($account);
$msg = 'SQL query in Shout_Driver_Sql#getMenus(): ' . $sql;
- Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($msg, 'DEBUG');
$result = $this->_db->query($sql, $values);
if ($result instanceof PEAR_Error) {
throw new Shout_Exception($result);
}
$msg = 'SQL query in Shout_Driver_Sql#saveMenu(): ' . $sql;
- Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($msg, 'DEBUG');
$result = $this->_write_db->query($sql, $values);
if ($result instanceof PEAR_Error) {
throw new Shout_Exception($result);
}
$sql = "SELECT accounts.code AS account, menus.name AS description, " .
- "actions.name AS action, menu_entries.digit AS digit, " .
+ "actions.name AS action, menu_entries.digit AS digit, " .
"menu_entries.args AS args FROM menu_entries " .
"INNER JOIN menus ON menu_entries.menu_id = menus.id " .
"INNER JOIN actions ON menu_entries.action_id = actions.id " .
$values = array($account, $menu);
$msg = 'SQL query in Shout_Driver_Sql#getMenuActions(): ' . $sql;
- Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($msg, 'DEBUG');
$result = $this->_db->query($sql, $values);
if ($result instanceof PEAR_Error) {
throw new Shout_Exception($result);
$sql = 'DELETE FROM menu_entries WHERE digit = ?';
$values = array($digit);
$msg = 'SQL query in Shout_Driver_Sql#saveMenuAction(): ' . $sql;
- Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($msg, 'DEBUG');
$result = $this->_write_db->query($sql, $values);
if ($result instanceof PEAR_Error) {
throw new Shout_Exception($result);
'(SELECT id FROM actions WHERE name = ?), ?)';
$yamlargs = Horde_Yaml::dump($args);
$values = array($account, $menu, $digit, $action, $yamlargs);
- Horde::logMessage("Data: ".print_r($values, true), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage("Data: ".print_r($values, true), 'ERR');
$msg = 'SQL query in Shout_Driver_Sql#saveMenuAction(): ' . $sql;
- Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($msg, 'DEBUG');
$result = $this->_write_db->query($sql, $values);
if ($result instanceof PEAR_Error) {
throw new Shout_Exception($result);
$sql = sprintf($sql, $this->_params['table']);
$args = array($account);
$msg = 'SQL query in Shout_Driver_Sql#getDevices(): ' . $sql;
- Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($msg, 'DEBUG');
$sth = $this->_db->prepare($sql);
$result = $this->_db->execute($sth, $args);
if ($result instanceof PEAR_Error) {
$sql = sprintf($sql, $this->_params['table']);
$msg = 'SQL query in Shout_Driver_Sql#saveDevice(): ' . $sql;
- Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($msg, 'DEBUG');
$sth = $this->_write_db->prepare($sql);
$result = $this->_write_db->execute($sth, $args);
if ($result instanceof PEAR_Error) {
$msg = $result->getMessage() . ': ' . $result->getDebugInfo();
- Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($msg, 'ERR');
throw new Shout_Exception(_("Internal database error. Details have been logged for the administrator."));
}
$values = array($devid);
$msg = 'SQL query in Shout_Driver_Sql#deleteDevice(): ' . $sql;
- Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($msg, 'DEBUG');
$res = $this->_write_db->query($sql);
if ($res instanceof PEAR_Error) {
$values = array($this->_params['bar']);
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Skeleton_Driver_Sql::retrieve(): %s', $query), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Skeleton_Driver_Sql::retrieve(): %s', $query), 'DEBUG');
/* Execute the query. */
$result = $this->_db->query($query, $values);
$values = array($this->_class);
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Skoli_Driver_sql::getStudents(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Skoli_Driver_sql::getStudents(): %s', $query), 'DEBUG');
/* Attempt the select query. */
$students = $this->_db->getAll($query, $values, DB_FETCHMODE_ASSOC);
/* Return an error immediately if the query failed. */
if (is_a($students, 'PEAR_Error')) {
- Horde::logMessage($students, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($students, 'ERR');
return $students;
}
$values = array($this->_class, $addressid);
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Skoli_Driver_sql::addStudents(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Skoli_Driver_sql::addStudents(): %s', $query), 'DEBUG');
/* Attempt the insertion query. */
$result = $this->_write_db->query($query, $values);
/* Return an error immediately if the query failed. */
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
}
$values = array($entryid);
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Skoli_Driver_sql::getEntry(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Skoli_Driver_sql::getEntry(): %s', $query), 'DEBUG');
/* Attempt the select query. */
$entry = $this->_db->getRow($query, $values, DB_FETCHMODE_ASSOC);
/* Return an error immediately if the query failed. */
if (is_a($entry, 'PEAR_Error')) {
- Horde::logMessage($entry, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($entry, 'ERR');
return $entry;
} else if (!is_array($entry)) {
return array();
$values = array($entryid);
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Skoli_Driver_sql::getEntry(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Skoli_Driver_sql::getEntry(): %s', $query), 'DEBUG');
/* Attempt the select query. */
$attributes = $this->_db->getAll($query, $values, DB_FETCHMODE_ASSOC);
/* Return an error immediately if the query failed. */
if (is_a($attributes, 'PEAR_Error')) {
- Horde::logMessage($attributes, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($attributes, 'ERR');
return $attributes;
}
$values = array_merge($values, $search_values);
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Skoli_Driver_sql::getEntries(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Skoli_Driver_sql::getEntries(): %s', $query), 'DEBUG');
/* Attempt the select query. */
$entries = $this->_db->getAll($query, $values, DB_FETCHMODE_ASSOC);
/* Return an error immediately if the query failed. */
if (is_a($entries, 'PEAR_Error')) {
- Horde::logMessage($entries, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($entries, 'ERR');
return $entries;
}
} else {
}
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Skoli_Driver_sql::getEntries(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Skoli_Driver_sql::getEntries(): %s', $query), 'DEBUG');
/* Attempt the select query. */
$entries = $this->_db->getAll($query, $values, DB_FETCHMODE_ASSOC);
/* Return an error immediately if the query failed. */
if (is_a($entries, 'PEAR_Error')) {
- Horde::logMessage($entries, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($entries, 'ERR');
return $entries;
}
}
$values = array($entry['object_id']);
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Skoli_Driver_sql::getEntries(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Skoli_Driver_sql::getEntries(): %s', $query), 'DEBUG');
/* Attempt the select query. */
$attributes = $this->_db->getAll($query, $values, DB_FETCHMODE_ASSOC);
/* Return an error immediately if the query failed. */
if (is_a($attributes, 'PEAR_Error')) {
- Horde::logMessage($attributes, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($attributes, 'ERR');
return $attributes;
}
$values = array($this->_class, $studentid);
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Skoli_Driver_sql::lastEntry(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Skoli_Driver_sql::lastEntry(): %s', $query), 'DEBUG');
/* Attempt the select query. */
$lastentry = $this->_db->getRow($query, $values, DB_FETCHMODE_ORDERED);
/* Return an error immediately if the query failed. */
if (is_a($lastentry, 'PEAR_Error')) {
- Horde::logMessage($lastentry, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($lastentry, 'ERR');
return $lastentry;
}
$values = array($this->_class, $vars->get('student_id'), $date->datestamp(), $vars->get('object_type'), $entryid);
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Skoli_Driver_sql::updateEntry(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Skoli_Driver_sql::updateEntry(): %s', $query), 'DEBUG');
/* Attempt the insertion query. */
$result = $this->_write_db->query($query, $values);
/* Return an error immediately if the query failed. */
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$values = array($entryid);
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Skoli_Driver_sql::updateEntry(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Skoli_Driver_sql::updateEntry(): %s', $query), 'DEBUG');
/* Attempt the delete query. */
$result = $this->_write_db->query($query, $values);
$values = array($entryid, $attribute, $value);
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Skoli_Driver_sql::addEntry(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Skoli_Driver_sql::addEntry(): %s', $query), 'DEBUG');
/* Attempt the insertion query. */
$result = $this->_write_db->query($query, $values);
/* Return an error immediately if the query failed. */
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
}
$values = array($entryId, Horde_Auth::getAuth(), $this->generateUID(), $this->_class, $studentid, $date->datestamp(), $vars->get('object_type'));
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Skoli_Driver_sql::addEntry(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Skoli_Driver_sql::addEntry(): %s', $query), 'DEBUG');
/* Attempt the insertion query. */
$result = $this->_write_db->query($query, $values);
/* Return an error immediately if the query failed. */
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$values = array($entryId, $attribute, $value);
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Skoli_Driver_sql::addEntry(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Skoli_Driver_sql::addEntry(): %s', $query), 'DEBUG');
/* Attempt the insertion query. */
$result = $this->_write_db->query($query, $values);
/* Return an error immediately if the query failed. */
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
}
}
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Skoli_Driver_sql::getSubjects(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Skoli_Driver_sql::getSubjects(): %s', $query), 'DEBUG');
/* Attempt the select query. */
$subjects = $this->_db->getAll($query, $values, DB_FETCHMODE_ORDERED);
/* Return an error immediately if the query failed. */
if (is_a($subjects, 'PEAR_Error')) {
- Horde::logMessage($subjects, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($subjects, 'ERR');
return $subjects;
}
$values = array($this->_class);
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Skoli_Driver_sql::deleteAll(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Skoli_Driver_sql::deleteAll(): %s', $query), 'DEBUG');
/* Attempt the delete query. */
$result = $this->_write_db->query($query, $values);
$values = array($this->_class);
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Skoli_Driver_sql::deleteAll(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Skoli_Driver_sql::deleteAll(): %s', $query), 'DEBUG');
/* Attempt the select query. */
$entries = $this->_db->getAll($query, $values, DB_FETCHMODE_ASSOC);
/* Return an error immediately if the query failed. */
if (is_a($entries, 'PEAR_Error')) {
- Horde::logMessage($entries, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($entries, 'ERR');
return $entries;
}
$values = array($object_id, $this->_class);
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Skoli_Driver_sql::deleteEntry(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Skoli_Driver_sql::deleteEntry(): %s', $query), 'DEBUG');
/* Attempt the delete query. */
$result = $this->_write_db->query($query, $values);
$values = array($object_id);
/* Log the query at a DEBUG log level. */
- Horde::logMessage(sprintf('Skoli_Driver_sql::deleteEntry(): %s', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage(sprintf('Skoli_Driver_sql::deleteEntry(): %s', $query), 'DEBUG');
/* Attempt the delete query. */
$result = $this->_write_db->query($query, $values);
$classes = $GLOBALS['skoli_shares']->listShares(Horde_Auth::getAuth(), $permission, $owneronly ? Horde_Auth::getAuth() : null, 0, 0, 'name');
if (is_a($classes, 'PEAR_Error')) {
- Horde::logMessage($classes, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($classes, 'ERR');
return array();
}
// Shares not enabled for this source
$driver = Turba_Driver::singleton($source);
if (is_a($driver, 'PEAR_Error')) {
- Horde::logMessage($driver, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($driver, 'ERR');
$hasError = true;
} else {
$result = $driver->removeUserData($user);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
}
}
}
$driver = Turba_Driver::singleton($config);
$result = $driver->removeUserData($user);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
$hasError = true;
}
}
/* Get a list of all shares this user has perms to and remove the perms */
$shares = $GLOBALS['turba_shares']->listShares($user);
if (is_a($shares, 'PEAR_Error')) {
- Horde::logMessage($shares, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($shares, 'ERR');
}
foreach ($shares as $share) {
$share->removeUser($user);
$results = $facebook->fql->run($fql);
} catch (Horde_Service_Facebook_Exception $e) {
$error = PEAR::raiseError($e->getMessage(), $e->getCode());
- Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($error, 'ERR');
return $error;
}
$results = $facebook->fql->run($fql);
} catch (Horde_Service_Facebook_Exception $e) {
$error = PEAR::raiseError($e->getMessage(), $e->getCode());
- Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($error, 'ERR');
return array();
}
$addressbook = array();
}
}
- Horde::logMessage('IMSP Driver initialized for ' . $this->_bookName, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('IMSP Driver initialized for ' . $this->_bookName, 'DEBUG');
$this->_authenticated = true;
return true;
}
}
Horde::logMessage(sprintf('IMSP returned %s results',
- count($results)), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ count($results)), 'DEBUG');
return array_values($results);
}
}
if (!is_callable(array($this->_kolab, 'listObjectsInFolder'))) {
- Horde::logMessage('The Framework Kolab package must be upgraded', __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage('The Framework Kolab package must be upgraded', 'ERR');
return PEAR::raiseError(_("Unable to search."));
}
}
if ($sourceName != null) {
- Horde::logMessage('deleteAll only working for current share. Called for $sourceName', __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage('deleteAll only working for current share. Called for $sourceName', 'ERR');
return PEAR::raiseError(sprintf(_("Cannot delete all address book entries for %s"), $sourceName));
}
}
Horde::logMessage(sprintf('Kolab returned %s results',
- count($result)), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ count($result)), 'DEBUG');
return array_values($result);
}
$ids = array();
if (!isset($test['field'])) {
- Horde::logMessage('Search field not set. Returning all entries.',
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Search field not set. Returning all entries.', 'DEBUG');
foreach ($entries as $entry) {
$ids[] = $entry['uid'];
}
/* Log the query at a DEBUG log level. */
Horde::logMessage(sprintf('LDAP query by Turba_Driver_ldap::_search(): user = %s, root = %s (%s); filter = "%s"; attributes = "%s"; deref = "%s" ; sizelimit = %d',
- Horde_Auth::getAuth(), $this->_params['root'], $this->_params['server'], $filter, implode(', ', $attr), $this->_params['deref'], $sizelimit),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde_Auth::getAuth(), $this->_params['root'], $this->_params['server'], $filter, implode(', ', $attr), $this->_params['deref'], $sizelimit), 'DEBUG');
/* Send the query to the LDAP server and fetch the matching
* entries. */
$values = array($test);
/* Log the query at a DEBUG log level. */
- Horde::logMessage('SQL query by Turba_Driver_sql::count(): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL query by Turba_Driver_sql::count(): ' . $query, 'DEBUG');
/* Run query. */
$count[$test] = $this->_db->getOne($query, $values);
$query = 'SELECT ' . implode(', ', $fields) . ' FROM ' . $this->_params['table'] . $where;
/* Log the query at a DEBUG log level. */
- Horde::logMessage('SQL query by Turba_Driver_sql::_search(): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL query by Turba_Driver_sql::_search(): ' . $query, 'DEBUG');
/* Run query. */
$result = $this->_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$iMax = count($fields);
while ($row = $result->fetchRow()) {
if (is_a($row, 'PEAR_Error')) {
- Horde::logMessage($row, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($row, 'ERR');
return $result;
}
. $this->_params['table'] . ' WHERE ' . $where;
/* Log the query at a DEBUG log level. */
- Horde::logMessage('SQL query by Turba_Driver_sql::_read(): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL query by Turba_Driver_sql::_read(): ' . $query, 'DEBUG');
$result = $this->_db->getAll($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$values = array($object_id);
/* Log the query at a DEBUG log level. */
- Horde::logMessage('SQL query by Turba_Driver_sql::_delete(): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL query by Turba_Driver_sql::_delete(): ' . $query, 'DEBUG');
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
/* Need a list of UIDs so we can notify History */
$query = 'SELECT '. $this->map['__uid'] . ' FROM ' . $this->_params['table'] . ' WHERE owner_id = ?';
- Horde::logMessage('SQL query by Turba_Driver_sql::_deleteAll(): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL query by Turba_Driver_sql::_deleteAll(): ' . $query, 'DEBUG');
$ids = $this->_write_db->query($query, $values);
if (is_a($ids, 'PEAR_Error')) {
return $ids;
/* Do the deletion */
$query = 'DELETE FROM ' . $this->_params['table'] . ' WHERE owner_id = ?';
- Horde::logMessage('SQL query by Turba_Driver_sql::_deleteAll(): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL query by Turba_Driver_sql::_deleteAll(): ' . $query, 'DEBUG');
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
$query .= 'WHERE ' . $where;
/* Log the query at a DEBUG log level. */
- Horde::logMessage('SQL query by Turba_Driver_sql::_save(): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('SQL query by Turba_Driver_sql::_save(): ' . $query, 'DEBUG');
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
/* Create Contact. */
$key = $driver->add($contact);
if (is_a($key, 'PEAR_Error')) {
- Horde::logMessage($key, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($key, 'ERR');
} else {
// Try 3 times to get the new entry. We retry to allow setups like
// LDAP replication to work.
}
sleep(1);
}
- Horde::logMessage($ob, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($ob, 'ERR');
}
$notification->push(_("There was an error adding the new contact. Contact your system administrator for further help."), 'horde.error');
}
return true;
} else {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
$notification->push(_("There was an error saving the contact. Contact your system administrator for further help."), 'horde.error');
return $result;
}
foreach ($in as $sourceId => $source) {
$driver = Turba_Driver::singleton($sourceId);
if (is_a($driver, 'PEAR_Error')) {
- Horde::logMessage(sprintf("Could not instantiate the %s source: %s", $sourceId, $driver->getMessage()), __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage(sprintf("Could not instantiate the %s source: %s", $sourceId, $driver->getMessage()), 'ERR');
continue;
}
'default' => true,
'name' => Horde_Auth::getAuth())));
if (is_a($share, 'PEAR_Error')) {
- Horde::logMessage($share, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($share, 'ERR');
continue;
}
Horde_Auth::getAuth(), $permission,
$owneronly ? Horde_Auth::getAuth() : null);
if (is_a($sources, 'PEAR_Error')) {
- Horde::logMessage($sources, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($sources, 'ERR');
return array();
}
return $sources;
if (!empty($conf['comments']['allow']) && $registry->hasMethod('forums/doComments')) {
$comments = $registry->call('forums/doComments', array('turba', $this->contact->driver->name . '.' . $this->contact->getValue('__key'), 'commentCallback'));
if (is_a($comments, 'PEAR_Error')) {
- Horde::logMessage($comments, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($comments, 'DEBUG');
$comments = array();
}
}
try {
$data = $vfs->read(TURBA_VFS_PATH . '/' . $object->getValue('__uid'), $filename);
} catch (VFS_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
throw new Turba_Exception(sprintf(_("Access denied to %s"), $filename));
}
$form->getInfo($vars, $info);
$delete = $vilma_driver->deleteDomain($info['domain_id']);
if (is_a($delete, 'PEAR_Error')) {
- Horde::logMessage($delete, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($delete, 'ERR');
$notification->push(sprintf(_("Error deleting domain. %s."), $delete->getMessage()), 'horde.error');
} else {
$notification->push(_("Domain deleted."), 'horde.success');
$info['name'] = Horde_String::lower($info['name']);
$domain_id = $vilma_driver->saveDomain($info);
if (is_a($domain_id, 'PEAR_Error')) {
- Horde::logMessage($domain_id, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($domain_id, 'ERR');
$notification->push(sprintf(_("Error saving domain: %s."), $domain_id->getMessage()), 'horde.error');
} else {
$notification->push(_("Domain saved."), 'horde.success');
*/
function getAddressInfo($address, $type = 'all')
{
- Horde::logMessage("Get Addresses Called for $domain with type $type and key $key", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage("Get Addresses Called for $domain with type $type and key $key", 'DEBUG');
$domain = Vilma::stripDomain($address);
$addresses = $this->getAddresses($domain, $type);
foreach($addresses as $addrinfo) {
*/
function saveAlias(&$info)
{
- Horde::logMessage("saveAlias called with info: " . print_r($info, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage("saveAlias called with info: " . print_r($info, true), 'DEBUG');
$result = $this->_saveAlias($info);
if (is_a($result, 'PEAR_Error')) {
return $result;
*/
function deleteAlias(&$info)
{
- Horde::logMessage("deleteAlias called with info: " . print_r($info, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage("deleteAlias called with info: " . print_r($info, true), 'DEBUG');
$result = $this->_deleteAlias($info);
if (is_a($result, 'PEAR_Error')) {
return $result;
*/
function saveForward(&$info)
{
- Horde::logMessage("saveForward called with info: " . print_r($info, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage("saveForward called with info: " . print_r($info, true), 'DEBUG');
$result = $this->_saveForward($info);
if (is_a($result, 'PEAR_Error')) {
return $result;
*/
function deleteForward(&$info)
{
- Horde::logMessage("deleteForward called with info: " . print_r($info, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage("deleteForward called with info: " . print_r($info, true), 'DEBUG');
$result = $this->_deleteForwrd($info);
if (is_a($result, 'PEAR_Error')) {
return $result;
'domain_max_users, domain_quota FROM vilma_domains ' .
'ORDER BY domain_name';
- Horde::logMessage($sql, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($sql, 'DEBUG');
return $this->_db->getAll($sql, $values, DB_FETCHMODE_ASSOC);
}
function getDomain($domain_id)
{
$sql = 'SELECT domain_id, domain_name, domain_transport, ' .
- 'domain_max_users, domain_quota FROM vilma_domains ' .
+ 'domain_max_users, domain_quota FROM vilma_domains ' .
'WHERE domain_id=? ORDER BY domain_name';
$values = array($domain_id);
- Horde::logMessage($sql, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($sql, 'DEBUG');
return $this->_db->getRow($sql, $values, DB_FETCHMODE_ASSOC);
}
'WHERE domain_name=?';
$values = array($domain_name);
- Horde::logMessage($sql, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($sql, 'DEBUG');
return $this->_db->getRow($sql, $values, DB_FETCHMODE_ASSOC);
}
function getAddresses($domain, $type = 'all', $key = 'user_name',
$direction = 0)
{
- Horde::logMessage("Get Addresses Called for $domain with type $type and key $key", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage("Get Addresses Called for $domain with type $type and key $key", 'DEBUG');
$addresses = array();
if ($type == 'all' || $type == 'user') {
$users = $this->_getUsers($domain);
Horde_Array::arraySort($addresses, $key, $direction, true);
return $addresses;
}
-
+
function getUser($user_id) {
$user = $this->getUserStatus($user_id);
} else {
return PEAR::raiseError(_("Unable to qualify address."));
}
- }
+ }
/**
* Returns an array of all users, aliases, groups and forwards for this
}
$filter .= ')';
- Horde::logMessage($filter, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($filter, 'DEBUG');
$res = ldap_search($this->_ldap, $this->_ldapparams['basedn'], $filter);
if ($res === false) {
return PEAR::raiseError(sprintf(_("Error in LDAP search: %s"), ldap_error($this->LDAP)));
}
$filter .= ')'; // End filter
- Horde::logMessage($filter, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($filter, 'DEBUG');
$res = @ldap_search($this->_ldap, $this->_ldapparams['basedn'], $filter);
if ($res === false) {
return PEAR::raiseError(sprintf(_("Error searching LDAP: %s"),
return $aliases;
}
-
+
/**
* Returns all available groups and forwards unless otherwise specified.
* If a domain name is passed then limit the results to groups or forwards
* in that domain. This method should not be called directly, but rather by
* way of getAddresses()
- *
+ *
* @access private
*
* @param string $acquire The default behavior is to acquire both
* groups and forwards; a value of 'group'
* will return only groups and a value of
* 'forward' will return only forwards.
- * @param string $domain The name of the domain from which to fetch
+ * @param string $domain The name of the domain from which to fetch
*
* @return array The available groups and forwards with details
*/
$domain = '_all';
}
$filter .= ')'; // End filter
- Horde::logMessage($filter, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($filter, 'DEBUG');
$res = @ldap_search($this->_ldap, $this->_ldapparams['basedn'], $filter);
if ($res === false) {
return PEAR::raiseError(sprintf(_("Error searching LDAP: %s"),
// Can't use foreach because of the array format returned by LDAP driver
$i = 0; // Address index
$e = 0; // Entry counter
-
+
while ($entry = @$res[$e]) {
$targets = array();
$a = 0; // Attribute counter
'targets' => $targets,
'user_name' => $entry[$this->_getAttrByField('user_name')][0],
'user_full_name' => @$entry[$this->_getAttrByField('user_name')][0],
- );
+ );
// If accountStatus is blank it's the same as active
if (!isset($entry[$this->_getAttrByField('user_enabled')][0]) ||
($entry[$this->_getAttrByField('user_enabled')][0] == 'active')) {
*/
function getAddressInfo($address, $type = 'all')
{
- Horde::logMessage("Get Addresses Called for $address with type $type and key $key", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage("Get Addresses Called for $address with type $type and key $key", 'DEBUG');
if ($type != 'alias') {
return parent::getAddressInfo($address, $type);
} else {
}
$filter .= '(mailAlternateAddress=' . $address . ')';
$filter .= ')'; // End filter
- Horde::logMessage($filter, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($filter, 'DEBUG');
$res = @ldap_search($this->_ldap, $this->_ldapparams['basedn'], $filter);
if ($res === false) {
return PEAR::raiseError(sprintf(_("Error searching LDAP: %s"),
if ($res === false) {
return PEAR::raiseError(sprintf(_("Error returning LDAP results: %s"), @ldap_error($this->_ldap)));
}
-
+
if ($res['count'] !== 1) {
return PEAR::raiseError(_("More than one DN returned for this alias. Please contact an administrator to resolve this error."));
}
-
+
return array(
'id' => $res[0]['dn'],
'address' => $address,
// that are valid for this system.
$values = array($info['name'], $info['transport'],
(int)$info['max_users'], (int)$info['quota']);
-
+
if (empty($info['domain_id'])) {
$nextid = $this->_db->nextId('vilma_domains');
$sql = 'INSERT INTO vilma_domains (domain_id, domain_name, ' .
'WHERE domain_id=?';
array_push($values, $info['domain_id']);
}
- Horde::logMessage($sql, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($sql, 'DEBUG');
return $this->_db->query($sql, $values);
}
$sql = 'DELETE FROM vilma_domains WHERE domain_id=?';
$values = array((int)$domain_id);
- Horde::logMessage($sql, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($sql, 'DEBUG');
return $this->_db->query($sql, $values);
}
*
* @param string $email_id The id of the account to be searched for.
*
- * @return Array of data for given email account on success or no
+ * @return Array of data for given email account on success or no
* information found; and for an error a PEAR::Error otherwise.
*/
function searchForAliases($email_id) {
*/
$filter .= '(mailAlternateAddress=' . $email_id . ')';
$filter .= ')'; // End filter
-
+
//echo $filter;
- Horde::logMessage($filter, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($filter, 'DEBUG');
$res = @ldap_search($this->_ldap, $this->_ldapparams['basedn'], $filter);
if ($res === false) {
return PEAR::raiseError(sprintf(_("Error searching LDAP: %s"),
return PEAR::raiseError(sprintf(_("Error retrieving LDAP results: %s"), @ldap_error($this->_ldap)));
}
- return $res;
+ return $res;
}
/**
*
* @param string $email_id The id of the account to be searched for.
*
- * @return Array of data for given email account on success or no
+ * @return Array of data for given email account on success or no
* information found; and for an error a PEAR::Error otherwise.
*/
function searchForUser($email_id)
}
$filter .= '(mail=' . $email_id . '))';
- Horde::logMessage($filter, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($filter, 'DEBUG');
$res = @ldap_search($this->_ldap, $this->_ldapparams['basedn'], $filter);
if ($res === false) {
return PEAR::raiseError(sprintf(_("Error searching LDAP: %s"),
} else if($res['count'] !== 1) {
return PEAR::raiseError(_("More than one DN returned. Aborting delete operation."));
}
- return $res;
+ return $res;
}
/**
$filter .= '(mail=' . $email_id . ')';
//echo $email_id . '<br>';
$filter .= ')';
- Horde::logMessage($filter, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($filter, 'DEBUG');
$res = @ldap_search($this->_ldap, $this->_ldapparams['basedn'], $filter);
if ($res === false) {
return PEAR::raiseError(sprintf(_("Error searching LDAP: %s"),
return PEAR::raiseError(_("Unable to acquire handle on DN. Aborting delete operation."));
} else if($res['count'] !== 1) {
return PEAR::raiseError(_("More than one DN returned. Aborting delete operation."));
- }
+ }
// We now have one unique DN to delete.
$res = @ldap_delete($this->_ldap, $res[0]['dn']);
if ($res === false) {
*/
function _saveAlias($info)
{
- Horde::logMessage("_saveAlias called with info: " . print_r($info, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage("_saveAlias called with info: " . print_r($info, true), 'DEBUG');
$address = $info['address'];
if (!empty($info['alias'])) {
$alias = $info['alias'];
$create = true;
} // if
$alias_address = $info['alias_address'];
-
+
$user_res = $this->searchForUser($address);
if (is_a($user_res, 'PEAR_Error') || ($res['count'] === 0) ) {
return PEAR::raiseError(_("Error reading address information from backend."));
} // if
$user = $user_res[0];
-
+
// Retrieve the current MAA values
if (array_key_exists('mailalternateaddress', $user_res[0])) {
$maa = $user['mailalternateaddress'];
} else {
$maa = array();
} // if
-
- Horde::logMessage("Resource contains: " . print_r($maa, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+
+ Horde::logMessage("Resource contains: " . print_r($maa, true), 'DEBUG');
$update = false;
$oldmaa = $maa;
// Already exists, throw a notification
return PEAR::raiseError(_("That alias already exists!"));
} // if
-
+
} else {
if ($alias == $alias_address) {
/* do nothing */;
} // if
}
} // if
-
-
+
+
if ($update) {
$dn = $user['dn'];
- Horde::logMessage("UPDATING: $dn \nOld MAA: " . print_r($oldmaa, true) . "\nNew MAA: " . print_r($maa, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage("UPDATING: $dn \nOld MAA: " . print_r($oldmaa, true) . "\nNew MAA: " . print_r($maa, true), 'DEBUG');
// return PEAR::raiseError(sprintf(_("Update Code Not Written."), $alias));
if ($this->_ldap) {
// bind with appropriate dn to give update access
return PEAR::raiseError(_("Unable to bind to the LDAP server. Check authentication credentials."));
}
$entry["mailAlternateAddress"] = $maa;
-
+
$res = @ldap_modify($this->_ldap, $dn, $entry);
if ($res === false) {
return PEAR::raiseError(sprintf(_("Error modifying account: %s"), @ldap_error($this->_ldap)));
} // if
} // if
} // if
-
+
return true;
}
-
+
function _deleteAlias($info)
{
- Horde::logMessage("_deleteAlias called with info: " . print_r($info, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage("_deleteAlias called with info: " . print_r($info, true), 'DEBUG');
$address = $info['address'];
$alias = $info['alias'];
-
+
$user_res = $this->searchForUser($address);
if (is_a($user_res, 'PEAR_Error') || ($res['count'] === 0) ) {
return PEAR::raiseError(_("Error reading address information from backend."));
} // if
$user = $user_res[0];
-
+
// Retrieve the current MAA values
if (array_key_exists('mailalternateaddress', $user_res[0])) {
$maa = $user['mailalternateaddress'];
} else {
$maa = array();
} // if
-
- Horde::logMessage("Resource contains: " . print_r($maa, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+
+ Horde::logMessage("Resource contains: " . print_r($maa, true), 'DEBUG');
$update = false;
$oldmaa = $maa;
$update = true;
} else {
/* skip */;
- } // if
-
+ } // if
+
if ($update) {
$dn = $user['dn'];
- Horde::logMessage("UPDATING: $dn \nOld MAA: " . print_r($oldmaa, true) . "\nNew MAA: " . print_r($maa, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage("UPDATING: $dn \nOld MAA: " . print_r($oldmaa, true) . "\nNew MAA: " . print_r($maa, true), 'DEBUG');
// return PEAR::raiseError(sprintf(_("Update Code Not Written."), $alias));
if ($this->_ldap) {
// bind with appropriate dn to give update access
return PEAR::raiseError(_("Unable to bind to the LDAP server. Check authentication credentials."));
}
$entry["mailAlternateAddress"] = $maa;
-
+
$res = @ldap_modify($this->_ldap, $dn, $entry);
if ($res === false) {
return PEAR::raiseError(sprintf(_("Error modifying account: %s"), @ldap_error($this->_ldap)));
} // if
} // if
} // if
-
+
return true;
}
-
+
/**
* Modifies forward data on the backend. See Driver::saveForward() for parameter info.
*
*/
function _saveForward($info)
{
- Horde::logMessage("_saveForward called with info: " . print_r($info, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage("_saveForward called with info: " . print_r($info, true), 'DEBUG');
$address = $info['address'];
if (!empty($info['forward'])) {
$forward = $info['forward'];
$create = true;
} // if
$forward_address = $info['forward_address'];
-
+
$user_res = $this->searchForUser($address);
if (is_a($user_res, 'PEAR_Error') || ($res['count'] === 0) ) {
return PEAR::raiseError(_("Error reading address information from backend."));
} // if
$user = $user_res[0];
-
+
// Retrieve the current MAA values
if (array_key_exists('mailforwardingaddress', $user_res[0])) {
$mfa = $user['mailforwardingaddress'];
} else {
$mfa = array();
} // if
-
- Horde::logMessage("Resource contains: " . print_r($mfa, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+
+ Horde::logMessage("Resource contains: " . print_r($mfa, true), 'DEBUG');
$update = false;
$oldmfa = $mfa;
// Already exists, throw a notification
return PEAR::raiseError(sprintf(_("That forward, \"%s\", already exists!"), $forward_address));
} // if
-
+
} else {
if ($forward == $forward_address) {
/* do nothing */;
} // if
}
} // if
-
-
+
+
if ($update) {
$dn = $user['dn'];
- Horde::logMessage("UPDATING: $dn \nOld MFA: " . print_r($oldmfa, true) . "\nNew MFA: " . print_r($mfa, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage("UPDATING: $dn \nOld MFA: " . print_r($oldmfa, true) . "\nNew MFA: " . print_r($mfa, true), 'DEBUG');
// return PEAR::raiseError(sprintf(_("Update Code Not Written."), $alias));
if ($this->_ldap) {
// bind with appropriate dn to give update access
return PEAR::raiseError(_("Unable to bind to the LDAP server. Check authentication credentials."));
}
$entry["mailForwardingAddress"] = $mfa;
-
+
$res = @ldap_modify($this->_ldap, $dn, $entry);
if ($res === false) {
return PEAR::raiseError(sprintf(_("Error modifying account: %s"), @ldap_error($this->_ldap)));
} // if
} // if
} // if
-
+
return true;
}
*/
function _deleteForward($info)
{
- Horde::logMessage("_deleteForward called with info: " . print_r($info, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage("_deleteForward called with info: " . print_r($info, true), 'DEBUG');
$address = $info['address'];
$forward = $info['forward'];
-
+
$user_res = $this->searchForUser($address);
if (is_a($user_res, 'PEAR_Error') || ($res['count'] === 0) ) {
return PEAR::raiseError(_("Error reading address information from backend."));
} // if
$user = $user_res[0];
-
+
// Retrieve the current MFA values
if (array_key_exists('mailforwardingaddress', $user_res[0])) {
$mfa = $user['mailforwardingaddress'];
} else {
$mfa = array();
} // if
-
- Horde::logMessage("Resource contains: " . print_r($mfa, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+
+ Horde::logMessage("Resource contains: " . print_r($mfa, true), 'DEBUG');
$update = false;
$oldmfa = $mfa;
} else {
/* skip */;
} // if
-
+
if ($update) {
$dn = $user['dn'];
- Horde::logMessage("UPDATING: $dn \nOld MFA: " . print_r($oldmfa, true) . "\nNew MFA: " . print_r($mfa, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage("UPDATING: $dn \nOld MFA: " . print_r($oldmfa, true) . "\nNew MFA: " . print_r($mfa, true), 'DEBUG');
// return PEAR::raiseError(sprintf(_("Update Code Not Written."), $alias));
if ($this->_ldap) {
// bind with appropriate dn to give update access
return PEAR::raiseError(_("Unable to bind to the LDAP server. Check authentication credentials."));
}
$entry["mailForwardingAddress"] = $mfa;
-
+
$res = @ldap_modify($this->_ldap, $dn, $entry);
if ($res === false) {
return PEAR::raiseError(sprintf(_("Error modifying account: %s"), @ldap_error($this->_ldap)));
} // if
} // if
} // if
-
+
return true;
}
-
+
/* Sorting function to sort aliases, forwards, and accounts by domain name first,
* then by user component.
*/
$a_comp = split("@", $a);
$b_comp = split("@", $b);
// not finished.
- }
+ }
function _saveUser(&$info)
{
return $addrinfo;
}
$type = $addrinfo['type'];
- if($type == 'user') {
+ if($type == 'user') {
//continue, this is a user.
} else {
//return PEAR::raiseError(_("Unable to save account of type " . $type));
}
$user_info = $this->searchForUser($address);
- if (is_a($user_info, 'PEAR_Error') || ($res['count'] === 0) ) {
+ if (is_a($user_info, 'PEAR_Error') || ($res['count'] === 0) ) {
return PEAR::raiseError(_("Error reading address information from backend."));
}
}
unset($info['password']);
}
-
+
$tmp['dn'] = $addrinfo['id'];
foreach ($info as $key => $val) {
$attr = $this->_getAttrByField($key);
}
if(isset($objectClassData)) {
array_shift($objectClassData);
- $entry['objectclass'] = $objectClassData;
+ $entry['objectclass'] = $objectClassData;
} else {
$entry['objectclass'] = array();
$entry['objectclass'][] = 'top';
}
} else {
return PEAR::raiseError(_("Unable to connect to LDAP server"));
- }
+ }
}
-
+
return PEAR::raiseError(_("Unable to save user information."));
}
$binds[0] . ' ORDER BY domain_name';
$values = $binds[1];
- Horde::logMessage($sql, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($sql, 'DEBUG');
return $this->_db->getAll($sql, $values, DB_FETCHMODE_ASSOC);
}
' WHERE ' . $this->_getTableField('domains', 'domain_id') . ' = ?' . $binds[0];
array_unshift($binds[1], (int)$domain_id);
- Horde::logMessage($sql, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($sql, 'DEBUG');
return $this->_db->getRow($sql, $binds[1], DB_FETCHMODE_ASSOC);
}
' WHERE ' . $this->_getTableField('domains', 'domain_name') . ' = ?' . $binds[0];
array_unshift($binds[1], $domain_name);
- Horde::logMessage($sql, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($sql, 'DEBUG');
return $this->_db->getRow($sql, $binds[1], DB_FETCHMODE_ASSOC);
}
$values = $binds[1];
}
- Horde::logMessage($sql, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($sql, 'DEBUG');
return $this->_db->getAll($sql, $values, DB_FETCHMODE_ASSOC);
}
' WHERE ' . $this->_getTableField('users', 'user_id') . ' = ?' . $binds[0];
array_unshift($binds[1], (int)$user_id);
- Horde::logMessage($sql, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($sql, 'DEBUG');
return $this->_db->getRow($sql, $binds[1], DB_FETCHMODE_ASSOC);
}
' ORDER BY virtual_destination, virtual_email';
$values = array_merge($values, $binds[1]);
- Horde::logMessage($sql, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($sql, 'DEBUG');
return $this->_db->getAll($sql, $values, DB_FETCHMODE_ASSOC);
}
' WHERE ' . $this->_getTableField('virtuals', 'virtual_id') . ' = ?' . $binds[0];
array_unshift($binds[1], (int)$virtual_id);
- Horde::logMessage($sql, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($sql, 'DEBUG');
$virtual = $this->_db->getRow($sql, $binds[1], DB_FETCHMODE_ASSOC);
$virtual['stripped_email'] = Vilma::stripUser($virtual['virtual_email']);
' WHERE ' . $this->_getTableField('users', 'user_name') . ' LIKE ?' . $binds[0];
array_unshift($binds[1], '%@' . $domain_name);
- Horde::logMessage($sql, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($sql, 'DEBUG');
return $this->_db->getOne($sql, $binds[1]);
}
$values = $binds[1];
}
- Horde::logMessage($sql, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($sql, 'DEBUG');
return $this->_db->query($sql, $values);
}
' WHERE ' . $this->_getTableField('domains', 'domain_id') . ' = ?';
$values = array((int)$domain_id);
- Horde::logMessage($sql, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($sql, 'DEBUG');
return $this->_db->query($sql, $values);
}
(int)$info['user_id']);
}
- Horde::logMessage($sql, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($sql, 'DEBUG');
$result = $this->_db->query($sql);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
' WHERE ' . $this->_getTableField('virtuals', 'virtual_destination') . ' = ?';
$values = array($user['user_name']);
- Horde::logMessage($sql, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($sql, 'DEBUG');
$delete = $this->_db->query($sql, $values);
if (is_a($delete, 'PEAR_Error')) {
return $delete;
' WHERE ' . $this->_getTableField('users', 'user_id') . ' = ?';
$values = array((int)$user_id);
- Horde::logMessage($sql, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($sql, 'DEBUG');
$result = $this->_db->query($sql, $values);
if (is_a($result, 'PEAR_Error')) {
return $result;
$info['virtual_destination'],
$info['virtual_id']);
- Horde::logMessage($sql, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($sql, 'DEBUG');
return $this->_db->query($sql, $values);
}
' WHERE ' . $this->_getTableField('virtuals', 'virtual_id') . ' = ?' . $binds[0];
array_unshift($binds[1], $virtual_id);
- Horde::logMessage($sql, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($sql, 'DEBUG');
return $this->_db->query($sql, $binds[1]);
}
$deleteInfo['alias'] = $user_id;
$delete = $vilma_driver->deleteAlias($deleteInfo);
if (is_a($delete, 'PEAR_Error')) {
- Horde::logMessage($delete, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($delete, 'ERR');
$notification->push(sprintf(_("Error deleting alias. %s."), $delete->getMessage()), 'horde.error');
$url = Util::addParameter(Horde::applicationUrl('users/index.php'), 'domain_id', $domain['id'], false);
header('Location: ' . $url);
$deleteInfo['forward'] = $user_id;
$delete = $vilma_driver->deleteForward($deleteInfo);
if (is_a($delete, 'PEAR_Error')) {
- Horde::logMessage($delete, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($delete, 'ERR');
$notification->push(sprintf(_("Error deleting forward. %s."), $delete->getMessage()), 'horde.error');
$url = Horde_Util::addParameter(Horde::applicationUrl('users/index.php'), 'domain_id', $domain['id'], false);
header('Location: ' . $url);
//$delete = $vilma_driver->deleteUser($info['user_id']);
$delete = $vilma_driver->deleteUser($address['address']);
if (is_a($delete, 'PEAR_Error')) {
- Horde::logMessage($delete, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($delete, 'ERR');
$notification->push(sprintf(_("Error deleting user. %s."), $delete->getMessage()), 'horde.error');
$url = Horde_Util::addParameter(Horde::applicationUrl('users/index.php'), 'domain_id', $domain['id'], false);
header('Location: ' . $url);
$info['user_name'] = Horde_String::lower($info['user_name']) . '@' . $domain;
$user_id = $vilma_driver->saveUser($info);
if (is_a($user_id, 'PEAR_Error')) {
- Horde::logMessage($user_id, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($user_id, 'ERR');
$notification->push(sprintf(_("Error saving user. %s"), $user_id->getMessage()), 'horde.error');
} else {
$notification->push(_("User details saved."), 'horde.success');
/* If the form is submitted, $vars['mode'] will be set. Catch this and process the submission so that the displayed form accurately indicates the result of the transaction. */
if ($vars->exists('mode')) {
- Horde::logMessage("Submit Detected: " . print_r(serialize($vars), true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage("Submit Detected: " . print_r(serialize($vars), true), 'DEBUG');
$form = &new EditAliasForm($vars);
if ($form->validate($vars)) {
$form->getInfo($vars, $info);
$alias_id = $vilma_driver->saveAlias($info);
if (is_a($alias_id, 'PEAR_Error')) {
- Horde::logMessage($user_id, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($user_id, 'ERR');
$notification->push(sprintf(_("Error saving alias. %s"), $alias_id->getMessage()), 'horde.error');
// remove the mode, and rearrange the alias information to clean up the form.
$vars->remove('mode');
/* Check if a form is being edited. */
if (!$vars->exists('mode') || $vars->getExists('retry')) {
- Horde::logMessage("No-Submit Detected: " . print_r(serialize($vars), true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage("No-Submit Detected: " . print_r(serialize($vars), true), 'DEBUG');
if ($vars->exists("alias")) {
$alias = $vars->get("alias");
- Horde::logMessage("Alias Detected: $alias", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage("Alias Detected: $alias", 'DEBUG');
$addrInfo = $vilma_driver->getAddressInfo($alias,'alias');
- Horde::logMessage("addrInfo contains: " . print_r($addrInfo, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage("addrInfo contains: " . print_r($addrInfo, true), 'DEBUG');
if (is_a($addrInfo, 'PEAR_Error')) {
$notification->push(sprintf(_("Error reading address information from backend: %s"), $addrInfo->getMessage()), 'horde.error');
$url = '/users/index.php';
exit;
}
$address = $vilma_driver->getAddressInfo($addrInfo['destination']);
- Horde::logMessage("address Info contains: " . print_r($address, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage("address Info contains: " . print_r($address, true), 'DEBUG');
$vars = new Variables($address);
$vars->set('mode', 'edit');
$vars->add('alias_address', $alias);
$vars->add('address', $address['address']);
} elseif ($vars->exists("address")) {
$tmp_address = $vars->get("address");
- Horde::logMessage("Address Detected: $tmp_address", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage("Address Detected: $tmp_address", 'DEBUG');
$address = $vilma_driver->getAddressInfo($tmp_address, 'all');
- Horde::logMessage("addrInfo contains: " . print_r($addrInfo, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage("addrInfo contains: " . print_r($addrInfo, true), 'DEBUG');
$vars = new Variables($address);
$vars->set('mode', 'new');
}
$form->getInfo($vars, $info);
$alias_id = $vilma_driver->saveAlias($info);
if (is_a($alias_id, 'PEAR_Error')) {
- Horde::logMessage($user_id, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($user_id, 'ERR');
$notification->push(sprintf(_("Error saving alias. %s"), $alias_id->getMessage()), 'horde.error');
} else {
$notification->push(_("Alias saved."), 'horde.success');
/* If the form is submitted, $vars['mode'] will be set. Catch this and process the submission so that the displayed form accurately indicates the result of the transaction. */
if ($vars->exists('mode')) {
- Horde::logMessage("Submit Detected: " . print_r(serialize($vars), true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage("Submit Detected: " . print_r(serialize($vars), true), 'DEBUG');
$form = &new EditForwardForm($vars);
if ($form->validate($vars)) {
$form->getInfo($vars, $info);
$forward_id = $vilma_driver->saveForward($info);
if (is_a($forward_id, 'PEAR_Error')) {
- Horde::logMessage($user_id, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($user_id, 'ERR');
$notification->push(sprintf(_("Error saving forward. %s"), $forward_id->getMessage()), 'horde.error');
// remove the mode, and rearrange the forward information to clean up the form.
$vars->remove('mode');
/* Check if a form is being edited. */
if (!$vars->exists('mode') || $vars->getExists('retry')) {
- Horde::logMessage("No-Submit Detected: " . print_r(serialize($vars), true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage("No-Submit Detected: " . print_r(serialize($vars), true), 'DEBUG');
if ($vars->exists("forward")) {
$forward = $vars->get("forward");
- Horde::logMessage("Forward Detected: $forward", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage("Forward Detected: $forward", 'DEBUG');
$addrInfo = $vilma_driver->getAddressInfo($forward,'forward');
- Horde::logMessage("addrInfo contains: " . print_r($addrInfo, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage("addrInfo contains: " . print_r($addrInfo, true), 'DEBUG');
if (is_a($addrInfo, 'PEAR_Error')) {
$notification->push(sprintf(_("Error reading address information from backend: %s"), $addrInfo->getMessage()), 'horde.error');
$url = '/users/index.php';
exit;
}
$address = $vilma_driver->getAddressInfo($addrInfo['destination']);
- Horde::logMessage("address Info contains: " . print_r($address, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage("address Info contains: " . print_r($address, true), 'DEBUG');
$vars = new Variables($address);
$vars->set('mode', 'edit');
$vars->add('forward_address', $forward);
$vars->add('address', $address['address']);
} elseif ($vars->exists("address")) {
$tmp_address = $vars->get("address");
- Horde::logMessage("Address Detected: $tmp_address", __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage("Address Detected: $tmp_address", 'DEBUG');
$address = $vilma_driver->getAddressInfo($tmp_address, 'all');
- Horde::logMessage("addrInfo contains: " . print_r($addrInfo, true), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage("addrInfo contains: " . print_r($addrInfo, true), 'DEBUG');
$vars = new Variables($address);
$vars->set('mode', 'new');
}
$form->getInfo($vars, $info);
$forward_id = $vilma_driver->saveforward($info);
if (is_a($forward_id, 'PEAR_Error')) {
- Horde::logMessage($user_id, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($user_id, 'ERR');
$notification->push(sprintf(_("Error saving forward. %s"), $forward_id->getMessage()), 'horde.error');
} else {
$notification->push(_("forward saved."), 'horde.success');
$form->getInfo($vars, $info);
$delete = $vilma_driver->deleteVirtual($info['virtual_id']);
if (is_a($delete, 'PEAR_Error')) {
- Horde::logMessage($delete, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($delete, 'ERR');
$notification->push(sprintf(_("Error deleting virtual email. %s."), $delete->getMessage()), 'horde.error');
} else {
$notification->push(_("Virtual email deleted."), 'horde.success');
}
$virtual_id = $vilma_driver->saveVirtual($info, $domain);
if (is_a($virtual_id, 'PEAR_Error')) {
- Horde::logMessage($virtual_id, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($virtual_id, 'ERR');
$notification->push(sprintf(_("Error saving virtual email. %s."), $virtual_id->getMessage()), 'horde.error');
} else {
$notification->push(_("Virtual email saved."), 'horde.success');
try {
$res = $GLOBALS['registry']->call('contacts/search', array($search, $sparams['sources'], $sparams['fields'], false));
} catch (Horde_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
return array();
}
$entry = sprintf('%s Message sent to %s from "%s"',
$_SERVER['REMOTE_ADDR'], $to,
Horde_Auth::getAuth());
- Horde::logMessage($entry, __FILE__, __LINE__, PEAR_LOG_INFO);
+ Horde::logMessage($entry, 'INFO');
} catch (Horde_Mime_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
}
}
}
// Get a new unique id.
$new_id = $this->_write_db->nextId('whups_queues');
if (is_a($new_id, 'PEAR_Error')) {
- Horde::logMessage($new_id, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($new_id, 'ERR');
return $new_id;
}
$email);
Horde::logMessage(
sprintf('Whups_Driver_sql::addQueue(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
// Get a new unique id.
$new_id = $this->_write_db->nextId('whups_types');
if (is_a($new_id, 'PEAR_Error')) {
- Horde::logMessage($new_id, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($new_id, 'ERR');
return $new_id;
}
$this->_params['charset']));
Horde::logMessage(
sprintf('Whups_Driver_sql::addType(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
// Get a new state id.
$new_id = $this->_write_db->nextId('whups_states');
if (is_a($new_id, 'PEAR_Error')) {
- Horde::logMessage($new_id, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($new_id, 'ERR');
return $new_id;
}
$this->_params['charset']));
Horde::logMessage(
sprintf('Whups_Driver_sql::addState(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
// Get a new priority id.
$new_id = $this->_write_db->nextId('whups_priorities');
if (is_a($new_id, 'PEAR_Error')) {
- Horde::logMessage($new_id, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($new_id, 'ERR');
return $new_id;
}
$this->_params['charset']));
Horde::logMessage(
sprintf('Whups_Driver_sql::addPriority(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
// Get a new version id.
$new_id = $this->_write_db->nextId('whups_versions');
if (is_a($new_id, 'PEAR_Error')) {
- Horde::logMessage($new_id, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($new_id, 'ERR');
return $new_id;
}
(int)$active);
Horde::logMessage(
sprintf('Whups_Driver_sql::addVersion(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
// Get a new reply id.
$new_id = $this->_write_db->nextId('whups_replies');
if (is_a($new_id, 'PEAR_Error')) {
- Horde::logMessage($new_id, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($new_id, 'ERR');
return $new_id;
}
$this->_params['charset']));
Horde::logMessage(
sprintf('Whups_Driver_sql::addReply(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
// Get the new unique ids for this ticket and the initial comment.
$ticketId = $this->_write_db->nextId('whups_tickets');
if (is_a($ticketId, 'PEAR_Error')) {
- Horde::logMessage($ticketId, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($ticketId, 'ERR');
return $ticketId;
}
$version);
Horde::logMessage(
sprintf('Whups_Driver_sql::addTicket(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$values = array((string)$requester, $info['user_email']);
Horde::logMessage(
sprintf('Whups_Driver_sql::addTicket(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
}
$ticketId, $comment, $requester,
isset($info['user_email']) ? $info['user_email'] : null);
if (is_a($commentId, 'PEAR_Error')) {
- Horde::logMessage($commentId, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($commentId, 'ERR');
return $commentId;
}
'comment' => $commentId,
'queue' => $queue));
if (is_a($transaction, 'PEAR_Error')) {
- Horde::logMessage($transaction, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($transaction, 'ERR');
return $transaction;
}
array('assign' => $owner),
$transaction);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
}
$attribute_id,
$attribute_value);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$this->updateLog(
{
$id = $this->_write_db->nextId('whups_comments');
if (is_a($id, 'PEAR_Error')) {
- Horde::logMessage($id, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($id, 'ERR');
return $id;
}
Horde_String::convertCharset($comment, Horde_Nls::getCharset(), $this->_params['charset']),
time()));
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$values = array((string)$creator, $creator_email);
Horde::logMessage(
sprintf('Whups_Driver_sql::addComment(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
}
Horde::logMessage(
sprintf('Whups_Driver_sql::updateTicket(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
return $this->_write_db->query($query, $values);
}
$values = array($id);
Horde::logMessage(
sprintf('Whups_Driver_sql::deleteTicket(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
}
. "WHERE $where";
Horde::logMessage(
- sprintf('Whups_Driver_sql::executeQuery(): query="%s"', $sql),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ sprintf('Whups_Driver_sql::executeQuery(): query="%s"', $sql), 'DEBUG');
$ids = $this->_db->getAssoc($sql);
if (is_a($ids, 'PEAR_Error')) {
- Horde::logMessage($ids, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($ids, 'ERR');
$GLOBALS['notification']->push($ids, 'horde.error');
return array();
}
. 'GROUP BY ' . $groupby;
Horde::logMessage(
sprintf('Whups_Driver_sql::getTicketsByProperties(): query="%s"',
- $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query), 'DEBUG');
$info = $this->_db->getAll($query, null, DB_FETCHMODE_ASSOC);
if (is_a($info, 'PEAR_Error')) {
- Horde::logMessage($info, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($info, 'ERR');
return $info;
}
{
$result = $this->getTicketsByProperties(array('id' => $ticket));
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
} elseif (!isset($result[0])) {
return PEAR::raiseError(sprintf(_("Ticket %s was not found."),
. 'WHERE ticket_id = ?';
Horde::logMessage(
sprintf('Whups_Driver_sql::getTicketState(): query="%s"; values="%s"',
- $query, $ticket_id),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, $ticket_id), 'DEBUG');
$state = $this->_db->getRow($query, array($ticket_id),
DB_FETCHMODE_ASSOC);
if (is_a($state, 'PEAR_Error')) {
- Horde::logMessage($state, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($state, 'ERR');
}
return $state;
}
$values = array($guest_id);
Horde::logMessage(
sprintf('Whups_Driver_sql::getGuestEmail(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$result = $this->_db->getOne($query, $values);
if (is_a($result, 'PEAR_Error')) {
return $result;
$query = "SELECT $fields FROM whups_logs $join WHERE $where "
. "ORDER BY whups_logs.transaction_id";
Horde::logMessage(sprintf('Whups_Driver_sql::_getHistory(): query="%s"',
- $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query), 'DEBUG');
$history = $this->_db->getAll($query, null, DB_FETCHMODE_ASSOC);
if (is_a($history, 'PEAR_Error')) {
- Horde::logMessage($history, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($history, 'ERR');
return $history;
}
. 'GROUP BY q.queue_id, q.queue_slug, q.queue_name, '
. 'q.queue_description ORDER BY q.queue_name';
Horde::logMessage(
- sprintf('Whups_Driver_sql::getQueueSummary(): query="%s"', $sql),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ sprintf('Whups_Driver_sql::getQueueSummary(): query="%s"', $sql), 'DEBUG');
$queues = $this->_db->getAll($sql, null, DB_FETCHMODE_ASSOC);
if (is_a($queues, 'PEAR_Error')) {
- Horde::logMessage($queues, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($queues, 'ERR');
return $queues;
}
$values = array((int)$queueId);
Horde::logMessage(
sprintf('Whups_Driver_sql::getQueueInternal(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$queue = $this->_db->getRow($query, $values, DB_FETCHMODE_ASSOC);
if (is_a($queue, 'PEAR_Error')) {
- Horde::logMessage($queue, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($queue, 'ERR');
return $queue;
} elseif (!$queue) {
return false;
$values = array((string)$slug);
Horde::logMessage(
sprintf('Whups_Driver_sql::getQueueInternal(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$queue = $this->_db->getAll($query, $values);
if (is_a($queue, 'PEAR_Error')) {
- Horde::logMessage($queue, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($queue, 'ERR');
return $queue;
} elseif (!count($queue)) {
return $queue;
$query = 'SELECT queue_id, queue_name FROM whups_queues '
. 'ORDER BY queue_name';
Horde::logMessage(sprintf('Whups_Driver_sql::getQueues(): query="%s"',
- $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query), 'DEBUG');
$queues = $this->_db->getAssoc($query);
if (is_a($queues, 'PEAR_Error')) {
- Horde::logMessage($queues, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($queues, 'ERR');
return array();
}
$queueId);
Horde::logMessage(
sprintf('Whups_Driver_sql::updateQueue(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
}
$values = array($queueId);
Horde::logMessage(
sprintf('Whups_Driver_sql::updateQueue(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$values = array($queueId, $typeId, $default == $typeId ? 1 : 0);
Horde::logMessage(
sprintf('Whups_Driver_sql::updateQueue(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
}
$query = 'SELECT type_id FROM whups_types_queues '
. 'WHERE type_default = 1 AND queue_id = ?';
Horde::logMessage(
- sprintf('Whups_Driver_sql::setDefaultType(): query="%s"', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ sprintf('Whups_Driver_sql::setDefaultType(): query="%s"', $query), 'DEBUG');
$type = $this->_db->getOne($query, array($queue));
if (is_a($type, 'PEAR_Error')) {
- Horde::logMessage($type, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($type, 'ERR');
return null;
}
return $type;
$values = array($queueId);
Horde::logMessage(
sprintf('Whups_Driver_sql::deleteQueue(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
}
// Delete existing associations.
$query = 'DELETE FROM whups_types_queues';
Horde::logMessage(
- sprintf('Whups_Driver_sql::updateTypesQueues(): query="%s"', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ sprintf('Whups_Driver_sql::updateTypesQueues(): query="%s"', $query), 'DEBUG');
$result = $this->_write_db->query($query);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
$this->_write_db->rollback();
$this->_write_db->autoCommit(true);
return $result;
$values = array((int)$pair[0], (int)$pair[1]);
Horde::logMessage(
sprintf('Whups_Driver_sql::updateTypesQueues(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
$this->_write_db->rollback();
$this->_write_db->autoCommit(true);
return $result;
$result = $this->_write_db->commit();
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
$this->_write_db->rollback();
$this->_write_db->autoCommit(true);
return $result;
$values = array($queueId);
Horde::logMessage(
sprintf('Whups_Driver_sql::getQueueUsers(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$users = $this->_db->getAssoc($query, false, $values);
if (is_a($users, 'PEAR_Error')) {
- Horde::logMessage($users, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($users, 'ERR');
return array();
}
$values = array($queueId, $user);
Horde::logMessage(
sprintf('Whups_Driver_sql::addQueueUser(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
}
$values = array($queueId, $userId);
Horde::logMessage(
sprintf('Whups_Driver_sql::removeQueueUser(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
return $this->_write_db->query($query, $values);
}
$values = array($typeId);
Horde::logMessage(
sprintf('Whups_Driver_sql::getType(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$type = $this->_db->getAssoc($query, false, $values);
if (is_a($type, 'PEAR_Error')) {
- Horde::logMessage($type, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($type, 'ERR');
return $type;
}
$values = array($queueId);
Horde::logMessage(
sprintf('Whups_Driver_sql::getTypes(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$types = $this->_db->getAssoc($query, false, $values);
if (is_a($types, 'PEAR_Error')) {
- Horde::logMessage($types, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($types, 'ERR');
return array();
}
$values = array($queueId);
Horde::logMessage(
sprintf('Whups_Driver_sql::getTypeIds(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
return $this->_db->getAll($query, $values, DB_FETCHMODE_ASSOC);
}
{
$query = 'SELECT type_id, type_name FROM whups_types ORDER BY type_name';
Horde::logMessage(sprintf('Whups_Driver_sql::getAllTypes(): query="%s"',
- $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query), 'DEBUG');
$types = $this->_db->getAssoc($query);
if (is_a($types, 'PEAR_Error')) {
- Horde::logMessage($types, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($types, 'ERR');
return array();
}
$query = 'SELECT type_id, type_name, type_description '
. 'FROM whups_types ORDER BY type_id';
Horde::logMessage(
- sprintf('Whups_Driver_sql::getAllTypeInfo(): query="%s"', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ sprintf('Whups_Driver_sql::getAllTypeInfo(): query="%s"', $query), 'DEBUG');
$info = $this->_db->getAll($query, null, DB_FETCHMODE_ASSOC);
if (is_a($info, 'PEAR_Error')) {
- Horde::logMessage($info, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($info, 'ERR');
return $info;
}
$values = array($type);
Horde::logMessage(
sprintf('Whups_Driver_sql::getTypeName(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$name = $this->_db->getOne($query, $values);
if (is_a($name, 'PEAR_Error')) {
- Horde::logMessage($name, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($name, 'ERR');
return $name;
}
$typeId);
Horde::logMessage(
sprintf('Whups_Driver_sql::updateType(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
return $this->_write_db->query($query, $values);
}
$query = 'DELETE FROM whups_states WHERE type_id = ?';
Horde::logMessage(
sprintf('Whups_Driver_sql::deleteType(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$this->_write_db->query($query, $values);
$query = 'DELETE FROM whups_priorities WHERE type_id = ?';
Horde::logMessage(
sprintf('Whups_Driver_sql::deleteType(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$this->_write_db->query($query, $values);
$query = 'DELETE FROM whups_attributes_desc WHERE type_id = ?';
Horde::logMessage(
sprintf('Whups_Driver_sql::deleteType(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$this->_write_db->query($query, $values);
$query = 'DELETE FROM whups_types WHERE type_id = ?';
Horde::logMessage(
sprintf('Whups_Driver_sql::deleteType(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
return $this->_write_db->query($query, $values);
}
$query = "SELECT $fields FROM $from$where ORDER BY $order";
Horde::logMessage(sprintf('Whups_Driver_sql::getStates(): query="%s"',
- $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query), 'DEBUG');
$states = $this->_db->getAssoc($query);
if (is_a($states, 'PEAR_Error')) {
- Horde::logMessage($states, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($states, 'ERR');
return $states;
}
$values = array($stateId);
Horde::logMessage(
sprintf('Whups_Driver_sql::getState(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$state = $this->_db->getAssoc($query, false, $values);
if (is_a($state, 'PEAR_Error')) {
- Horde::logMessage($state, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($state, 'ERR');
return $state;
}
$values = array($type);
Horde::logMessage(
sprintf('Whups_Driver_sql::getAllStateInfo(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$info = $this->_db->getAll($query, $values, DB_FETCHMODE_ASSOC);
if (is_a($info, 'PEAR_Error')) {
- Horde::logMessage($info, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($info, 'ERR');
return $info;
}
$stateId);
Horde::logMessage(
sprintf('Whups_Driver_sql::updateState(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
return $this->_write_db->query($query, $values);
}
$values = array($type);
Horde::logMessage(
sprintf('Whups_Driver_sql::getDefaultState(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
return $this->_db->getOne($query, $values);
}
$values = array($type);
Horde::logMessage(
sprintf('Whups_Driver_sql::setDefaultState(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$query = 'UPDATE whups_states SET state_default = 1 WHERE state_id = ?';
$values = array($state);
Horde::logMessage(
sprintf('Whups_Driver_sql::setDefaultState(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
return $this->_write_db->query($query, $values);
}
$values = array((int)$state_id);
Horde::logMessage(
sprintf('Whups_Driver_sql::deleteState(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
return $this->_write_db->query($query, $values);
}
$values = array((int)$queryId);
Horde::logMessage(
sprintf('Whups_Driver_sql::getQuery(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$query = $this->_db->getRow($query, $values, DB_FETCHMODE_ASSOC);
if (is_a($query, 'PEAR_Error')) {
- Horde::logMessage($query, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($query, 'ERR');
return $query;
}
$this->_params['charset']);
Horde::logMessage(
sprintf('Whups_Driver_sql::saveQuery(): query="%s"; values="%s"',
- $q, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $q, implode(',', $values)), 'DEBUG');
return $this->_write_db->query($q, $values);
}
$values = array((int)$queryId);
Horde::logMessage(
sprintf('Whups_Driver_sql::deleteQuery(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
return $this->_write_db->query($query, $values);
}
$values = array((int)$state_id, $category);
Horde::logMessage(
sprintf('Whups_Driver_sql::isCategory(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
return $this->_db->getOne($query, $values);
}
$values = array((int)$type);
Horde::logMessage(
sprintf('Whups_Driver_sql::getAllPriorityInfo(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$info = $this->_db->getAll($query, $values, DB_FETCHMODE_ASSOC);
if (is_a($info, 'PEAR_Error')) {
- Horde::logMessage($info, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($info, 'ERR');
return $info;
}
$query = "SELECT $fields FROM $from$where ORDER BY $order";
Horde::logMessage(
sprintf('SQL Query by Whups_Driver_sql::getPriorities(): query="%s"',
- $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query), 'DEBUG');
$priorities = $this->_db->getAssoc($query);
if (is_a($priorities, 'PEAR_Error')) {
- Horde::logMessage($priorities, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($priorities, 'ERR');
return $priorities;
}
$values = array((int)$priorityId);
Horde::logMessage(
sprintf('Whups_Driver_sql::getPriority(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$priority = $this->_db->getAssoc($query, false, $values);
if (is_a($priority, 'PEAR_Error')) {
- Horde::logMessage($priority, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($priority, 'ERR');
return $priority;
}
$priorityId);
Horde::logMessage(
sprintf('Whups_Driver_sql::updatePriority(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
return $this->_write_db->query($query, $values);
}
$values = array($type);
Horde::logMessage(
sprintf('Whups_Driver_sql::getDefaultPriority(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
return $this->_db->getOne($query, $values);
}
$values = array($type);
Horde::logMessage(
sprintf('Whups_Driver_sql::setDefaultPriority(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$query = 'UPDATE whups_priorities SET priority_default = 1 '
$values = array($priority);
Horde::logMessage(
sprintf('Whups_Driver_sql::setDefaultPriority(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
return $this->_write_db->query($query, $values);
}
$values = array($priorityId);
Horde::logMessage(
sprintf('Whups_Driver_sql::deletePriority(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
return $this->_write_db->query($query, $values);
}
$values = array($queue);
Horde::logMessage(
sprintf('Whups_Driver_sql::getVersionInfoInternal(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$info = $this->_db->getAll($query, $values, DB_FETCHMODE_ASSOC);
if (is_a($info, 'PEAR_Error')) {
- Horde::logMessage($info, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($info, 'ERR');
return $info;
}
$values = array($versionId);
Horde::logMessage(
sprintf('Whups_Driver_sql::getVersionInternal(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$version = $this->_db->getAssoc($query, false, $values);
if (is_a($version, 'PEAR_Error')) {
- Horde::logMessage($version, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($version, 'ERR');
return $version;
}
(int)$versionId);
Horde::logMessage(
sprintf('Whups_Driver_sql::updateVersion(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
return $this->_write_db->query($query, $values);
}
$values = array($versionId);
Horde::logMessage(
sprintf('Whups_Driver_sql::deleteVersion(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
return $this->_write_db->query($query, $values);
}
$values = array((int)$type);
Horde::logMessage(
sprintf('Whups_Driver_sql::getReplies(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$info = $this->_db->getAssoc($query, false, $values, DB_FETCHMODE_ASSOC);
if (is_a($info, 'PEAR_Error')) {
- Horde::logMessage($info, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($info, 'ERR');
return $info;
}
$values = array((int)$reply_id);
Horde::logMessage(
sprintf('Whups_Driver_sql::getReply(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$reply = $this->_db->getRow($query, $values, DB_FETCHMODE_ASSOC);
if (is_a($reply, 'PEAR_Error')) {
- Horde::logMessage($reply, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($reply, 'ERR');
return $reply;
}
$reply);
Horde::logMessage(
sprintf('Whups_Driver_sql::updateReply(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
}
return $result;
}
$values = array((int)$reply);
Horde::logMessage(
sprintf('Whups_Driver_sql::deleteReply(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
return parent::deleteReply($reply);
$values = array($ticket, $user);
Horde::logMessage(
sprintf('Whups_Driver_sql::addListener(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$values = array($ticket, $user);
Horde::logMessage(
sprintf('Whups_Driver_sql::deleteListener(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$values = array($ticket);
Horde::logMessage(
sprintf('Whups_Driver_sql::getListeners(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)),' DEBUG');
$users = $this->_db->getCol($query, 0, $values);
if (is_a($users, 'PEAR_Error')) {
- Horde::logMessage($users, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($users, 'ERR');
return array();
}
$tinfo = $this->getTicketDetails($ticket);
if (is_a($tinfo, 'PEAR_Error')) {
- Horde::logMessage($tinfo, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($tinfo, 'ERR');
return array();
}
$requester = $tinfo['user_id_requester'];
// FIXME: This assumes that $type_id is a valid type id.
$new_id = $this->_write_db->nextId('whups_attributes_desc');
if (is_a($new_id, 'PEAR_Error')) {
- Horde::logMessage($new_id, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($new_id, 'ERR');
return $new_id;
}
Horde::logMessage(
sprintf('Whups_Driver_sql::addAttributeDesc(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$attribute_id);
Horde::logMessage(
sprintf('Whups_Driver_sql::updateAttributeDesc(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
return $this->_write_db->query($query, $values);
}
$values = array($attribute_id);
Horde::logMessage(
sprintf('Whups_Driver_sql::deleteAttributeDesc(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$this->_write_db->query($query, $values);
$query = 'DELETE FROM whups_attributes WHERE attribute_id = ?';
$values = array($attribute_id);
Horde::logMessage(
sprintf('Whups_Driver_sql::deleteAttributeDesc(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$this->_write_db->query($query, $values);
$this->_write_db->commit();
$this->_write_db->autoCommit(true);
$query = 'SELECT attribute_id, attribute_name, attribute_description, '
. 'type_id FROM whups_attributes_desc';
Horde::logMessage(
- sprintf('Whups_Driver_sql::getAllAttributes(): query="%s"', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ sprintf('Whups_Driver_sql::getAllAttributes(): query="%s"', $query), 'DEBUG');
$attributes = $this->_db->getAssoc($query, false, array(),
DB_FETCHMODE_ASSOC);
if (is_a($attributes, 'PEAR_Error')) {
- Horde::logMessage($attributes, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($attributes, 'ERR');
return $attributes;
}
$values = array($attribute_id);
Horde::logMessage(
sprintf('Whups_Driver_sql::getAttributeDesc(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$attribute = $this->_db->getRow($query, $values, DB_FETCHMODE_ASSOC);
if (is_a($attribute, 'PEAR_Error')) {
- Horde::logMessage($attribute, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($attribute, 'ERR');
return $attribute;
}
$values = array($attribute_id);
Horde::logMessage(
sprintf('Whups_Driver_sql::getAttributeName(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$name = $this->_db->getOne($query, $values);
if (is_a($name, 'PEAR_Error')) {
- Horde::logMessage($name, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($name, 'ERR');
return $name;
}
$query = "SELECT $fields FROM $from$where ORDER BY $order";
Horde::logMessage(
sprintf('Whups_Driver_sql::getAttributesForType(): query="%s"',
- $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query), 'DEBUG');
$attributes = $this->_db->getAssoc($query, false, null,
DB_FETCHMODE_ASSOC);
if (is_a($attributes, 'PEAR_Error')) {
- Horde::logMessage($attributes, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($attributes, 'ERR');
return $attributes;
}
$values = array((int)$type_id);
Horde::logMessage(
sprintf('Whups_Driver_sql::getAttributeNamesForType(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$names = $this->_db->getAll($query, $values, DB_FETCHMODE_ASSOC);
if (is_a($names, 'PEAR_Error')) {
- Horde::logMessage($names, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($names, 'ERR');
return $names;
}
$values = array((int)$type_id);
Horde::logMessage(
sprintf('Whups_Driver_sql::getAttributeNamesForType(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$info = $this->_db->getAll($query, $values, DB_FETCHMODE_ASSOC);
if (is_a($info, 'PEAR_Error')) {
- Horde::logMessage($info, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($info, 'ERR');
return $info;
}
$values = array($ticket_id, $attribute_id);
Horde::logMessage(
sprintf('Whups_Driver_sql::_setAttributeValue(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$this->_write_db->query($query, $values);
if (!empty($attribute_value)) {
$values = array($ticket_id, $attribute_id, $db_attribute_value);
Horde::logMessage(
sprintf('Whups_Driver_sql::_setAttributeValue(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$inserted = $this->_write_db->query($query, $values);
if (is_a($inserted, 'PEAR_Error')) {
- Horde::logMessage($inserted, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($inserted, 'ERR');
$this->_write_db->rollback();
$this->_write_db->autoCommit(true);
return $inserted;
. 'FROM whups_attributes WHERE ticket_id IN ('
. str_repeat('?, ', count($ticket_id) - 1) . '?)';
Horde::logMessage(
- sprintf('Whups_Driver_sql::getAttributes(): query="%s"', $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ sprintf('Whups_Driver_sql::getAttributes(): query="%s"', $query), 'DEBUG');
$attributes = $this->_db->getAll($query, $ticket_id,
DB_FETCHMODE_ASSOC);
} else {
$values = array((int)$ticket_id);
Horde::logMessage(
sprintf('Whups_Driver_sql::getTicketAttributes(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$attributes = $this->_db->getAssoc($query, false, $values);
}
if (is_a($attributes, 'PEAR_Error')) {
- Horde::logMessage($attributes, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($attributes, 'ERR');
return $attributes;
}
. str_repeat('?, ', count($ticket_id) - 1) . '?)';
Horde::logMessage(
sprintf('SQL Query by Whups_Driver_sql::getAttributes(): query="%s"',
- $query),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query), 'DEBUG');
$attributes = $this->_db->getAll($query, $ticket_id,
DB_FETCHMODE_ASSOC);
} else {
$values = array((int)$ticket_id);
Horde::logMessage(
sprintf('Whups_Driver_sql::getTicketAttributesWithNames(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$attributes = $this->_db->getAssoc($query, false, $values);
}
if (is_a($attributes, 'PEAR_Error')) {
- Horde::logMessage($attributes, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($attributes, 'ERR');
return $attributes;
}
$values = array($ticket_id, $ticket_id);
Horde::logMessage(
sprintf('Whups_Driver_sql::getAllTicketAttributesWithNames(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$attributes = $this->_db->getAll($query, $values, DB_FETCHMODE_ASSOC);
if (is_a($attributes, 'PEAR_Error')) {
- Horde::logMessage($attributes, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($attributes, 'ERR');
return $attributes;
}
$values = $ticketId;
Horde::logMessage(
sprintf('Whups_Driver_sql::getOwners(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
return $this->_db->getAll($query, $values, DB_FETCHMODE_ASSOC);
} else {
$query = 'SELECT ticket_owner, ticket_owner '
$values = array((int)$ticketId);
Horde::logMessage(
sprintf('Whups_Driver_sql::getOwners(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
return $this->_db->getAssoc($query, false, $values);
}
}
(int)$value);
Horde::logMessage(
sprintf('Whups_Driver_sql::updateLog(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
}
$values = array((string)$creator, $creator_email);
Horde::logMessage(
sprintf('Whups_Driver_sql::newTransaction(): query="%s"; values="%s"',
- $query, implode(',', $values)),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ $query, implode(',', $values)), 'DEBUG');
$result = $this->_write_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
}
$grouped_hook = true;
} catch (Horde_Exception_HookNotSet $e) {
} catch (Horde_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
}
$this->addHidden('', 'id', 'int', true, true);
$fp = @fopen($tmp_name, 'wb');
if (!$fp) {
Horde::logMessage(sprintf('Cannot open file %s for writing.',
- $tmp_name),
- __FILE__, __LINE__, PEAR_LOG_ERR);
+ $tmp_name), 'ERR');
return $ticket;
}
fwrite($fp, $part->getContents());
$grouped_hook = true;
} catch (Horde_Exception_HookNotSet $e) {
} catch (Horde_Exception $e) {
- Horde::logMessage($e, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($e, 'ERR');
}
foreach ($grouped_fields as $header => $fields) {
global $whups_driver;
$owners = $whups_driver->getOwners($ticket);
if (is_a($owners, 'PEAR_Error')) {
- Horde::logMessage($owners, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($owners, 'ERR');
return $owners->getMessage();
}
}
$ticket = Whups_Ticket::newTicket($info, Horde_Auth::getAuth());
if (is_a($ticket, 'PEAR_Error')) {
- Horde::logMessage($ticket, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($ticket, 'ERR');
$notification->push(sprintf(_("Adding your ticket failed: %s."),
$ticket->getMessage()),
'horde.error');
$pages = $this->_retrieve($this->_params['table'], $where);
if (is_a($pages, 'PEAR_Error')) {
- Horde::logMessage($pages, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($pages, 'ERR');
return $pages;
}
$params[] = (int)$minor;
}
- Horde::logMessage('Wicked_Driver_sql::removeAttachment: ' . $sql,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Wicked_Driver_sql::removeAttachment: ' . $sql, 'DEBUG');
$result = $this->_db->query($sql, $params);
if (is_a($result, 'PEAR_Error')) {
$sql .= ' AND attachment_majorversion = ? AND attachment_minorversion = ?';
}
- Horde::logMessage('Wicked_Driver_sql::removeAttachment: ' . $sql,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Wicked_Driver_sql::removeAttachment: ' . $sql, 'DEBUG');
return $this->_db->query($sql, $params);
}
' WHERE page_id = ?';
$params = array($pageId);
- Horde::logMessage('Wicked_Driver_sql::removeAllAttachments: ' . $sql,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Wicked_Driver_sql::removeAllAttachments: ' . $sql, 'DEBUG')
$result = $this->_db->query($sql, $params);
if (is_a($result, 'PEAR_Error')) {
$sql = 'DELETE FROM ' . $this->_params['attachmenthistorytable'] .
' WHERE page_id = ?';
- Horde::logMessage('Wicked_Driver_sql::removeAllAttachments: ' . $sql,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Wicked_Driver_sql::removeAllAttachments: ' . $sql, 'DEBUG');
return $this->_db->query($sql, $params);
}
' AND attachment_name = ' . $this->_db->quote($file['attachment_name']);
$attachments = $this->_retrieve($this->_params['attachmenttable'], $where);
if (is_a($attachments, 'PEAR_Error')) {
- Horde::logMessage($attachments, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($attachments, 'ERR');
return $attachments;
}
$this->_db->quote($file['attachment_name']));
$result = $this->_db->query($sql);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$this->_db->quote($this->_convertToDriver($file['attachment_name'])));
$result = $this->_db->query($sql);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
} else {
$this->_db->quote($this->_convertToDriver($file['attachment_name'])));
$result = $this->_db->query($sql);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
}
' SET page_hits = page_hits + 1 WHERE page_name = ?';
$values = array($this->_convertToDriver($pagename));
- Horde::logMessage('Wicked_Driver_sql::logPageView(' . $pagename . '): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Wicked_Driver_sql::logPageView(' . $pagename . '): ' . $query, 'DEBUG');
return $this->_db->query($query, $values);
}
$page_id = $this->_db->nextId($this->_params['table']);
if (is_a($page_id, 'PEAR_Error')) {
- Horde::logMessage($page_id, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($page_id, 'ERR');
return $page_id;
}
time(),
$author);
- Horde::logMessage('Wicked_Driver_sql::newPage(): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Wicked_Driver_sql::newPage(): ' . $query, 'DEBUG');
/* Attempt the insertion/update query. */
$result = $this->_db->query($query, $values);
/* Return an error immediately if the query failed. */
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
' SET page_name = ? WHERE page_name = ?';
$values = array($this->_convertToDriver($newname), $this->_convertToDriver($pagename));
- Horde::logMessage('Wicked_Driver_sql::renamePage(): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Wicked_Driver_sql::renamePage(): ' . $query, 'DEBUG');
$result = $this->_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
' SET page_name = ? WHERE page_name = ?';
$values = array($this->_convertToDriver($newname), $this->_convertToDriver($pagename));
- Horde::logMessage('Wicked_Driver_sql::renamePage(): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Wicked_Driver_sql::renamePage(): ' . $query, 'DEBUG');
$result = $this->_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$this->_params['table']);
$values = array($this->_convertToDriver($pagename));
- Horde::logMessage('Page ' . $pagename . ' saved with user agent ' . $GLOBALS['browser']->getAgentString(),
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
- Horde::logMessage('Wicked_Driver_sql::updateText(): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Page ' . $pagename . ' saved with user agent ' . $GLOBALS['browser']->getAgentString(), 'DEBUG');
+ Horde::logMessage('Wicked_Driver_sql::updateText(): ' . $query, 'DEBUG');
$result = $this->_db->query($query, $values);
/* Return an error immediately if the query failed. */
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
time(),
$this->_convertToDriver($pagename));
- Horde::logMessage('Wicked_Driver_sql::updateText(): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Wicked_Driver_sql::updateText(): ' . $query, 'DEBUG');
/* Attempt the insertion/update query. */
$result = $this->_db->query($query, $values);
/* Return an error immediately if the query failed. */
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
if (!isset($pageNames) || $no_cache) {
$query = 'SELECT page_id, page_name FROM ' . $this->_params['table'];
- Horde::logMessage('Wicked_Driver_sql::getPages(): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Wicked_Driver_sql::getPages(): ' . $query, 'DEBUG');
$result = $this->_db->getAssoc($query);
if (is_a($result, 'PEAR_Error')) {
' WHERE page_name = ? AND page_majorversion = ? AND page_minorversion = ?';
$values = array($this->_convertToDriver($pagename), $major, $minor);
- Horde::logMessage('Wicked_Driver_sql::removeVersion(): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Wicked_Driver_sql::removeVersion(): ' . $query, 'DEBUG');
$result = $this->_db->getOne($query, $values);
if ($result && !is_a($result, 'PEAR_Error')) {
' WHERE page_name = ? ORDER BY page_majorversion DESC, page_minorversion DESC';
$query = $this->_db->modifyLimitQuery($query, 0, 1, array($this->_convertToDriver($pagename)));
- Horde::logMessage('Wicked_Driver_sql::removeVersion(): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Wicked_Driver_sql::removeVersion(): ' . $query, 'DEBUG');
$revision = $this->_db->getRow($query, array($this->_convertToDriver($pagename)), DB_FETCHMODE_ASSOC);
if (is_a($revision, 'PEAR_Error')) {
- Horde::logMessage($revision, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($revision, 'ERR');
return $revision;
}
$revision['change_log'],
$this->_convertToDriver($pagename));
- Horde::logMessage('Wicked_Driver_sql::removeVersion(): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Wicked_Driver_sql::removeVersion(): ' . $query, 'DEBUG');
$result = $this->_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
' WHERE page_name = ? and page_majorversion = ? and page_minorversion = ?';
$values = array($this->_convertToDriver($pagename), $revision['page_majorversion'], $revision['page_minorversion']);
- Horde::logMessage('Wicked_Driver_sql::removeVersion(): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Wicked_Driver_sql::removeVersion(): ' . $query, 'DEBUG');
$result = $this->_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
} else {
$query = 'DELETE FROM ' . $this->_params['historytable'] .
' WHERE page_name = ? and page_majorversion = ? and page_minorversion = ?';
- Horde::logMessage('Wicked_Driver_sql::removeVersion(): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Wicked_Driver_sql::removeVersion(): ' . $query, 'DEBUG');
$result = $this->_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
}
' WHERE page_name = ?';
$values = array($this->_convertToDriver($pagename));
- Horde::logMessage('Wicked_Driver_sql::removeAllVersions(): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Wicked_Driver_sql::removeAllVersions(): ' . $query, 'DEBUG');
$result = $this->_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
' WHERE page_name = ?';
$values = array($this->_convertToDriver($pagename));
- Horde::logMessage('Wicked_Driver_sql::removeAllVersions(): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Wicked_Driver_sql::removeAllVersions(): ' . $query, 'DEBUG');
$result = $this->_db->query($query, $values);
if (is_a($result, 'PEAR_Error')) {
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
$query = $this->_db->modifyLimitQuery($query, 0, $limit);
}
- Horde::logMessage('Wicked_Driver_sql::_retrieve(): ' . $query,
- __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage('Wicked_Driver_sql::_retrieve(): ' . $query, 'DEBUG');
$result = $this->_db->query($query);
if (is_a($result, 'PEAR_Error')) {
$result = $wicked->attachFile($file, $data);
if (is_a($result, 'PEAR_Error')) {
$notification->push($result, 'horde.error');
- Horde::logMessage($result, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($result, 'ERR');
return $result;
}
if (is_a($ret, 'PEAR_Error')) {
$error = _("Couldn't read command-line options.");
- Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($error, 'DEBUG');
$cli->fatal($error);
}
$auth = Horde_Auth::singleton($conf['auth']['driver']);
if (!$auth->authenticate($username, array('password' => $password))) {
$error = _("Login is incorrect.");
- Horde::logMessage($error, __FILE__, __LINE__, PEAR_LOG_ERR);
+ Horde::logMessage($error, 'ERR');
$cli->message($msg, 'cli.error');
} else {
$msg = sprintf(_("Logged in successfully as \"%s\"."), $username);
- Horde::logMessage($msg, __FILE__, __LINE__, PEAR_LOG_DEBUG);
+ Horde::logMessage($msg, 'DEBUG');
$cli->message($msg, 'cli.success');
}
}
projects / horde.git / commitdiff