Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10940
Modified Files:
serendipity_admin_installer.inc.php
Added Files:
serendipity_functions_installer.inc.php
Log Message:
Add new functions file for the installer, the idea is to move all the functions to this file, at some point
First we centralize the function which updates serendipity_config_local.inc.php (because I need it in my upgrade script)
--- NEW FILE: serendipity_functions_installer.inc.php ---
<?php
function serendipity_updateLocalConfig($dbName, $dbPrefix, $dbHost, $dbUser, $dbPass, $dbType, $file='serendipity_config_local.inc.php', $path = null) {
global $serendipity;
umask(0000);
if ( is_null($path) ) {
$path = $serendipity['serendipityPath'];
}
$configfp = fopen($path . $file, 'w');
if ( !is_resource($configfp) ) {
$errs[] = sprintf(FILE_WRITE_ERROR, $file);
$errs[] = sprintf(DIRECTORY_RUN_CMD, 'chown -R www:www', $path) . ' (' . WWW_USER . ')';
$errs[] = sprintf(DIRECTORY_RUN_CMD, 'chmod 770' , $path);
$errs[] = BROWSER_RELOAD;
return $errs;
}
fwrite($configfp, "<?php\n");
fwrite($configfp, "\t/*\n");
fwrite($configfp, "\t Serendipity configuration file\n");
fwrite($configfp, "\t Written on ". date('r') ."\n");
fwrite($configfp, "\t*/\n\n");
fwrite($configfp, "\t\$serendipity['versionInstalled'] = '{$serendipity['version']}';\n");
fwrite($configfp, "\t\$serendipity['dbName'] = '{$dbName}';\n");
fwrite($configfp, "\t\$serendipity['dbPrefix'] = '{$dbPrefix}';\n");
fwrite($configfp, "\t\$serendipity['dbHost'] = '{$dbHost}';\n");
fwrite($configfp, "\t\$serendipity['dbUser'] = '{$dbUser}';\n");
fwrite($configfp, "\t\$serendipity['dbPass'] = '{$dbPass}';\n");
fwrite($configfp, "\t\$serendipity['dbType'] = '{$dbType}';\n");
fwrite($configfp, "?>\n");
fclose($configfp);
@chmod($path . $file, 0700);
return true;
}
?>
Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- serendipity_admin_installer.inc.php 18 Feb 2004 11:28:15 -0000 1.55
+++ serendipity_admin_installer.inc.php 29 Feb 2004 19:53:25 -0000 1.56
@@ -3,9 +3,11 @@
umask(0000);
$umask = 0770;
define('IN_installer', true);
-include_once('serendipity_config.inc.php');
-function serendipity_query_default($optname, $default)
-{
+
+require_once('serendipity_config.inc.php');
+require_once('serendipity_functions_installer.inc.php');
+
+function serendipity_query_default($optname, $default) {
switch ($optname) {
case 'serendipityPath':
return dirname(__FILE__) .'/';
@@ -466,35 +468,15 @@
foreach($p as $key => $entry) {
serendipity_set_config_var($entry['name'], $_POST[$entry['name']]);
}
-
- // Create a basic configuration file which gives enough information to open
- // the database and get information from the database tables
- $configfp = fopen('./serendipity_config_local.inc.php', 'w');
-
- if ( !is_resource($configfp) ) {
- $errs[] = sprintf(FILE_WRITE_ERROR, './serendipity_config_local.inc.php');
- $errs[] = sprintf(DIRECTORY_RUN_CMD, 'chown -R www:www', $_POST['serendipityPath']) . '(' . WWW_USER . ')';
- $errs[] = sprintf(DIRECTORY_RUN_CMD, 'chmod 770' , $_POST['serendipityPath']);
- $errs[] = BROWSER_RELOAD;
-
- return $errs;
- }
-
- fwrite($configfp, "<?php\n");
- fwrite($configfp, "\t\$serendipity['versionInstalled'] = '{$serendipity['version']}';\n\n");
- fwrite($configfp, "\t\$serendipity['dbName'] = '{$_POST['dbName']}';\n");
- fwrite($configfp, "\t\$serendipity['dbPrefix'] = '{$_POST['dbPrefix']}';\n");
- fwrite($configfp, "\t\$serendipity['dbHost'] = '{$_POST['dbHost']}';\n");
- fwrite($configfp, "\t\$serendipity['dbUser'] = '{$_POST['dbUser']}';\n");
- fwrite($configfp, "\t\$serendipity['dbPass'] = '{$_POST['dbPass']}';\n");
- fwrite($configfp, "\t\$serendipity['dbType'] = '{$_POST['dbType']}';\n");
- fwrite($configfp, "?>\n");
-
- fclose($configfp);
-
- @chmod('./serendipity_config_local.inc.php', $umask);
- return true;
-
+
+ return serendipity_updateLocalConfig($_POST['dbName'],
+ $_POST['dbPrefix'],
+ $_POST['dbHost'],
+ $_POST['dbUser'],
+ $_POST['dbPass'],
+ $_POST['dbType'],
+ 'serendipity_config_local.inc.php',
+ $_POST['serendipityPath']);
}
if (!isset($_POST['installAction'])) {
|