if (strlen($base) && $bits[0] != 'PasswordReset') {
- $this->jerror("BADURL","invalid url: $base");
+ $this->jerror("NOTICE-BADURL","invalid url: $base");
}
// deliver template
if (isset($_GET['onloadTrack'])) {
$au = $this->authUser;
if ($au) {
// is it an authfailure?
- $this->jerr("Permission denied to view this resource", array('authFailure' => true));
+ $this->jerror("LOGIN-NOPERM", "Permission denied to view this resource", array('authFailure' => true));
}
- $this->jerr("Not authenticated", array('authFailure' => true));
+ $this->jerror("LOGIN-NOAUTH", "Not authenticated", array('authFailure' => true));
}
}
$pman = HTML_FlexyFramework::get();
- if ($type !== false && empty($pman->nodatabase)) {
+
+
+
+
+ if ($type !== false && empty($pman->nodatabase)) {
if(!empty($errors)){
DB_DataObject::factory('Events')->writeEventLogExtra($errors);
}
+ // various codes that are acceptable.
+ //
+ if (!preg_match('/^(ERROR|NOTICE|LOG)/', $type )) {
+ $type = 'ERROR-' . $type;
+ }
$this->addEvent($type, false, $str);
exit;
}
+ function jnotice($type, $str, $errors=array(), $content_type = false)
+ {
+ return $this->jerror('NOTICE-' . $type, $str, $errors, $content_type);
+ }
function jok($str)
{
if ($this->transObj ) {
$reported = true;
- $out = is_a($ex,'Exception') || is_a($ex, 'Error') ? $ex->getMessage() : $ex->toString();
+ $out = (is_a($ex,'Exception') || is_a($ex, 'Error') ? $ex->getMessage() : $ex->toString()) .
+ ' ' . (empty($_SERVER['REQUEST_METHOD']) ? 'cli' : $_SERVER['REQUEST_METHOD'] ) . ' ' .
+ (empty($_SERVER['REQUEST_URI']) ? 'No URL' : $_SERVER['REQUEST_URI']) .
+ ' ' . (empty($POST) ? '' : file_get_contents('php://input')) ;
//print_R($bt); exit;
//convert the huge backtrace into something that is readable..
$out .= "\n" . implode("\n", $ret);
+
$this->addEvent("EXCEPTION", false, $out);
if ($this->showErrorToUser) {
function addEvent($act, $obj = false, $remarks = '')
{
- if (!empty(HTML_FlexyFramework::get()->Pman['disable_events'])
- || !empty(HTML_FlexyFramework::get()->database_is_readonly)
+ $ff = HTML_FlexyFramework::get();
+
+
+ if (!empty($ff->Pman['disable_events'])
+ || !empty($ff->database_is_readonly)
+ || substr($act, 0, 7) === 'NOTICE-'
) {
+ if (!preg_match('/^(ERROR|EXCEPTION)/', $act)) {
+ return false;
+ }
$str = $obj !== false ? "{$obj->tableName()}:{$obj->id} " : '';
$de = ini_set('display_errors', 0);
- trigger_error("$act {$str}{$remarks}" , E_USER_NOTICE);
+ trigger_error("{$act} {$str} {$remarks}" , E_USER_NOTICE);
ini_set('display_errors', $de );
-
-
- return;
+ return false;
}
+
$au = $this->getAuthUser();
$e = DB_DataObject::factory('Events');
$e->onInsert(isset($_REQUEST) ? $_REQUEST : array() , $this);
+ if (!preg_match('/^(ERROR|EXCEPTION)/', $act)) {
+ return $e;
+ }
+ $str = $obj !== false ? "{$obj->tableName()}:{$obj->id} " : '';
+ $de = ini_set('display_errors', 0);
+ trigger_error("{$act} [event_id={$e->id}] {$str} {$remarks}" , E_USER_NOTICE);
+ ini_set('display_errors', $de );
-
return $e;
}