summaryrefslogtreecommitdiff
path: root/install.php
diff options
context:
space:
mode:
Diffstat (limited to 'install.php')
-rw-r--r--install.php19
1 files changed, 16 insertions, 3 deletions
diff --git a/install.php b/install.php
index 319c261e4..e7f7cf318 100644
--- a/install.php
+++ b/install.php
@@ -94,6 +94,13 @@ $external_libraries=array(
'check_class'=>'HTTP_Request'
),
array(
+ 'name'=>'HTTP_Request2',
+ 'pear'=>'HTTP_Request2',
+ 'url'=>'http://pear.php.net/package/HTTP_Request2',
+ 'include'=>'HTTP/Request2.php',
+ 'check_class'=>'HTTP_Request2'
+ ),
+ array(
'name'=>'Mail',
'pear'=>'Mail',
'url'=>'http://pear.php.net/package/Mail',
@@ -124,6 +131,14 @@ $external_libraries=array(
'check_class'=>'Net_URL_Mapper'
),
array(
+ 'name'=>'Net_LDAP2',
+ 'pear'=>'Net_LDAP2',
+ 'url'=>'http://pear.php.net/package/Net_LDAP2',
+ 'deb'=>'php-net-ldap2',
+ 'include'=>'Net/LDAP2.php',
+ 'check_class'=>'Net_LDAP2'
+ ),
+ array(
'name'=>'Net_Socket',
'pear'=>'Net_Socket',
'url'=>'http://pear.php.net/package/Net_Socket',
@@ -692,9 +707,7 @@ function writeConf($sitename, $server, $path, $fancy, $db)
// database
"\$config['db']['database'] = '{$db['database']}';\n\n".
($db['type'] == 'pgsql' ? "\$config['db']['quote_identifiers'] = true;\n\n":'').
- "\$config['db']['type'] = '{$db['type']}';\n\n".
-
- "?>";
+ "\$config['db']['type'] = '{$db['type']}';\n\n";
// write configuration file out to install directory
$res = file_put_contents(INSTALLDIR.'/config.php', $cfg);