From 10eedbe75a2022d65ec349de5f3bd12400191974 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 28 Jan 2010 06:27:16 -0500
Subject: [PATCH] - add file/line definitions to raise_error() calls
---
program/include/rcube_config.php | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index a4f3699..85ff714 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -180,7 +180,7 @@
{
$this->prop = array_merge($this->prop, $prefs);
}
-
+
/**
* Getter for all config options
@@ -191,6 +191,7 @@
{
return $this->prop;
}
+
/**
* Return requested DES crypto key.
@@ -204,9 +205,8 @@
if (!array_key_exists($key, $this->prop))
{
raise_error(array(
- 'code' => 500,
- 'type' => 'php',
- 'file' => __FILE__,
+ 'code' => 500, 'type' => 'php',
+ 'file' => __FILE__, 'line' => __LINE__,
'message' => "Request for unconfigured crypto key \"$key\""
), true, true);
}
@@ -217,15 +217,15 @@
if (strlen($key) != 24)
{
raise_error(array(
- 'code' => 500,
- 'type' => 'php',
- 'file' => __FILE__,
+ 'code' => 500, 'type' => 'php',
+ 'file' => __FILE__, 'line' => __LINE__,
'message' => "Configured crypto key \"$key\" is not exactly 24 bytes long"
), true, true);
}
return $key;
}
+
/**
* Try to autodetect operating system and find the correct line endings
@@ -244,9 +244,8 @@
else
return "\n";
}
+
-
-
/**
* Return the mail domain configured for the given host
*
--
Gitblit v1.9.1