summaryrefslogtreecommitdiff
path: root/roundcubemail/program/include/rcube_config.php
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2010-01-28 11:27:16 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2010-01-28 11:27:16 +0000
commitf01835508614938c2cf0382b82ea62c2c4dedd16 (patch)
treec08f29e860b3c2cc281488a2579d7d84312151cd /roundcubemail/program/include/rcube_config.php
parent7a3551691e2eb17b7fe9f000d02f53c1742e05a5 (diff)
- add file/line definitions to raise_error() calls
git-svn-id: https://svn.roundcube.net/trunk@3231 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/include/rcube_config.php')
-rw-r--r--roundcubemail/program/include/rcube_config.php17
1 files changed, 8 insertions, 9 deletions
diff --git a/roundcubemail/program/include/rcube_config.php b/roundcubemail/program/include/rcube_config.php
index a4f3699d8..85ff714bf 100644
--- a/roundcubemail/program/include/rcube_config.php
+++ b/roundcubemail/program/include/rcube_config.php
@@ -180,7 +180,7 @@ class rcube_config
{
$this->prop = array_merge($this->prop, $prefs);
}
-
+
/**
* Getter for all config options
@@ -192,6 +192,7 @@ class rcube_config
return $this->prop;
}
+
/**
* Return requested DES crypto key.
*
@@ -204,9 +205,8 @@ class rcube_config
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,9 +217,8 @@ class rcube_config
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);
}
@@ -227,6 +226,7 @@ class rcube_config
return $key;
}
+
/**
* Try to autodetect operating system and find the correct line endings
*
@@ -244,9 +244,8 @@ class rcube_config
else
return "\n";
}
-
-
+
/**
* Return the mail domain configured for the given host
*