From edcb01e585240a0977dded101c5e715aa365e9df Mon Sep 17 00:00:00 2001
From: Gina Haeussge <osd@foosel.net>
Date: Sat, 28 Feb 2009 14:04:23 +0100
Subject: [PATCH] Split confToHash into confToHash and linesToHash
New function linesToHash (which now is used by existing function
confToHash) allows for parsing of given strings into a config
hash.
darcs-hash:20090228130423-2b4f5-e4f08c80350d83d3d93a4652aa8db1aae96e3a13.gz
---
inc/confutils.php | 27 +++++++++++++++++++++------
1 file changed, 21 insertions(+), 6 deletions(-)
diff --git a/inc/confutils.php b/inc/confutils.php
index 14b2ad727..aab0be4be 100644
--- a/inc/confutils.php
+++ b/inc/confutils.php
@@ -123,19 +123,16 @@ function getSchemes() {
}
/**
- * Builds a hash from a configfile
+ * Builds a hash from an array of lines
*
* If $lower is set to true all hash keys are converted to
* lower case.
*
* @author Harry Fuecks <hfuecks@gmail.com>
* @author Andreas Gohr <andi@splitbrain.org>
+ * @author Gina Haeussge <gina@foosel.net>
*/
-function confToHash($file,$lower=false) {
- $conf = array();
- $lines = @file( $file );
- if ( !$lines ) return $conf;
-
+function linesToHash($lines, $lower=false) {
foreach ( $lines as $line ) {
//ignore comments (except escaped ones)
$line = preg_replace('/(?<![&\\\\])#.*$/','',$line);
@@ -154,6 +151,24 @@ function confToHash($file,$lower=false) {
return $conf;
}
+/**
+ * Builds a hash from a configfile
+ *
+ * If $lower is set to true all hash keys are converted to
+ * lower case.
+ *
+ * @author Harry Fuecks <hfuecks@gmail.com>
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Gina Haeussge <gina@foosel.net>
+ */
+function confToHash($file,$lower=false) {
+ $conf = array();
+ $lines = @file( $file );
+ if ( !$lines ) return $conf;
+
+ return linesToHash($lines, $lower);
+}
+
/**
* Retrieve the requested configuration information
*
--
GitLab