[geeklog-cvs] Geeklog-1.x/public_html/admin/install addindex.php, 1.3, 1.4 check.php, 1.8, 1.9 help.php, 1.1, 1.2 index.php, 1.20, 1.21 success.php, 1.16, 1.17

Oliver ospiess at qs1489.pair.com
Sun Nov 25 01:58:57 EST 2007

Update of /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/install
In directory qs1489.pair.com:/tmp/cvs-serv9782/admin/install

Modified Files:
addindex.php check.php help.php index.php success.php
Log Message:
XHTML optional updates

Index: addindex.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/install/addindex.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** addindex.php 26 Jun 2005 08:38:32 -0000 1.3
--- addindex.php 25 Nov 2007 06:58:55 -0000 1.4
***************
*** 116,120 ****

if (sizeof ($newidx) > 0) {
! echo "<p>Adding indexes ...<br>";
foreach ($newidx as $ne) {
$idxname = $table . '_' . $ne;
--- 116,120 ----

if (sizeof ($newidx) > 0) {
! echo "<p>Adding indexes ...<br" . XHTML . ">";
foreach ($newidx as $ne) {
$idxname = $table . '_' . $ne;
***************
*** 130,134 ****
$idxtime = $idxtimer->stopTimer ();
$idxtimer->setPercision (4);
! echo " in $idxtime seconds<br>";
}
echo "Done!</p>";
--- 130,134 ----
$idxtime = $idxtimer->stopTimer ();
$idxtimer->setPercision (4);
! echo " in $idxtime seconds<br" . XHTML . ">";
}
echo "Done!</p>";
***************
*** 137,141 ****
}

! echo "<hr>";
}

--- 137,141 ----
}

! echo "<hr" . XHTML . ">";
}


Index: check.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/install/check.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** check.php 28 Jan 2006 17:48:49 -0000 1.8
--- check.php 25 Nov 2007 06:58:55 -0000 1.9
***************
*** 55,59 ****
echo '<h2>Testing your Geeklog installation ...</h2>' . LB;

! echo '<p>Testing <b>logs</b> directory ' . $_CONF['path_log'] . ' ...<br>' . LB;
$errfile = @fopen ($_CONF['path_log'] . 'error.log', 'a');
if ($errfile) fclose ($errfile);
--- 55,59 ----
echo '<h2>Testing your Geeklog installation ...</h2>' . LB;

! echo '<p>Testing <b>logs</b> directory ' . $_CONF['path_log'] . ' ...<br' . XHTML . '>' . LB;
$errfile = @fopen ($_CONF['path_log'] . 'error.log', 'a');
if ($errfile) fclose ($errfile);
***************
*** 72,76 ****
echo '<b>access.log</b> ';
}
! echo 'for writing.</font><br>Please check that you have set the <b>logs</b> directory <em>and</em> the files <b>error.log</b> and <b>access.log</b> in that directory to <b>chmod 775</b>.' . LB;
$logPerms = sprintf ("%3o", @fileperms ($_CONF['path_log']) & 0777);
$errPerms = sprintf ("%3o", @fileperms ($_CONF['path_log'] . 'error.log') & 0777);
--- 72,76 ----
echo '<b>access.log</b> ';
}
! echo 'for writing.</font><br' . XHTML . '>Please check that you have set the <b>logs</b> directory <em>and</em> the files <b>error.log</b> and <b>access.log</b> in that directory to <b>chmod 775</b>.' . LB;
$logPerms = sprintf ("%3o", @fileperms ($_CONF['path_log']) & 0777);
$errPerms = sprintf ("%3o", @fileperms ($_CONF['path_log'] . 'error.log') & 0777);
***************
*** 87,94 ****
}

! echo '<p>Testing <b>backend</b> directory ' . SYND_getFeedPath() . ' ...<br>' . LB;
if ($_CONF['backend'] > 0) {
if (!$file = @fopen ($_CONF['rdf_file'], 'w')) {
! echo '<font color="#ff0000">Could not open the RSS file ' . $_CONF['rdf_file'] . ' for writing.</font><br>Please check that you have set both the <b>backend</b> directory <em>and</em> the <b>geeklog.rss</b> file in that directory to <b>chmod 775</b>.' . LB;
$endPerms = sprintf ("%3o", @fileperms (SYND_getFeedPath()) & 0777);
$rdfPerms = sprintf ("%3o", @fileperms ($_CONF['rdf_file']) & 0777);
--- 87,94 ----
}

! echo '<p>Testing <b>backend</b> directory ' . SYND_getFeedPath() . ' ...<br' . XHTML . '>' . LB;
if ($_CONF['backend'] > 0) {
if (!$file = @fopen ($_CONF['rdf_file'], 'w')) {
! echo '<font color="#ff0000">Could not open the RSS file ' . $_CONF['rdf_file'] . ' for writing.</font><br' . XHTML . '>Please check that you have set both the <b>backend</b> directory <em>and</em> the <b>geeklog.rss</b> file in that directory to <b>chmod 775</b>.' . LB;
$endPerms = sprintf ("%3o", @fileperms (SYND_getFeedPath()) & 0777);
$rdfPerms = sprintf ("%3o", @fileperms ($_CONF['rdf_file']) & 0777);
***************
*** 109,115 ****

if ($_CONF['allow_user_photo'] > 0) {
! echo '<p>Testing <b>userphotos</b> directory ' . $_CONF['path_images'] . 'userphotos/ ...<br>' . LB;
if (!$file = @fopen ($_CONF['path_images'] . 'userphotos/test.gif', 'w')) {
! echo '<font color="#ff0000">Could not write to <b>' . $_CONF['path_images'] . 'userphotos/</b>.</font><br>Please make sure this directory exists and is set to <b>chmod 775</b>.<br>' . LB;
echo 'Current permissions for <b>userphotos</b>: ' . sprintf ("%3o", @fileperms ($_CONF['path_images'] . 'userphotos/') & 0777);
$failed++;
--- 109,115 ----

if ($_CONF['allow_user_photo'] > 0) {
! echo '<p>Testing <b>userphotos</b> directory ' . $_CONF['path_images'] . 'userphotos/ ...<br' . XHTML . '>' . LB;
if (!$file = @fopen ($_CONF['path_images'] . 'userphotos/test.gif', 'w')) {
! echo '<font color="#ff0000">Could not write to <b>' . $_CONF['path_images'] . 'userphotos/</b>.</font><br' . XHTML . '>Please make sure this directory exists and is set to <b>chmod 775</b>.<br' . XHTML . '>' . LB;
echo 'Current permissions for <b>userphotos</b>: ' . sprintf ("%3o", @fileperms ($_CONF['path_images'] . 'userphotos/') & 0777);
$failed++;
***************
*** 126,132 ****

if ($_CONF['maximagesperarticle'] > 0) {
! echo '<p>Testing <b>articles</b> directory ' . $_CONF['path_images'] . 'articles/ ...<br>' . LB;
if (!$file = @fopen ($_CONF['path_images'] . 'articles/test.gif', 'w')) {
! echo '<font color="#ff0000">Could not write to <b>' . $_CONF['path_images'] . 'articles/</b>.</font><br>Please make sure this directory exists and is set to <b>chmod 775</b>.<br>' . LB;
echo 'Current permissions for <b>articles</b>: ' . sprintf ("%3o", @fileperms ($_CONF['path_images'] . 'articles/') & 0777);
$failed++;
--- 126,132 ----

if ($_CONF['maximagesperarticle'] > 0) {
! echo '<p>Testing <b>articles</b> directory ' . $_CONF['path_images'] . 'articles/ ...<br' . XHTML . '>' . LB;
if (!$file = @fopen ($_CONF['path_images'] . 'articles/test.gif', 'w')) {
! echo '<font color="#ff0000">Could not write to <b>' . $_CONF['path_images'] . 'articles/</b>.</font><br' . XHTML . '>Please make sure this directory exists and is set to <b>chmod 775</b>.<br' . XHTML . '>' . LB;
echo 'Current permissions for <b>articles</b>: ' . sprintf ("%3o", @fileperms ($_CONF['path_images'] . 'articles/') & 0777);
$failed++;
***************
*** 142,148 ****
}

! echo '<p>Testing <b>topics</b> directory ' . $_CONF['path_images'] . 'topics/ ...<br>' . LB;
if (!$file = @fopen ($_CONF['path_images'] . 'topics/test.gif', 'w')) {
! echo '<font color="#ff0000">Could not write to <b>' . $_CONF['path_images'] . 'topics/</b>.</font><br>Please make sure this directory exists and is set to <b>chmod 775</b>.<br>' . LB;
echo 'Current permissions for <b>topics</b>: ' . sprintf ("%3o", @fileperms ($_CONF['path_images'] . 'articles/') & 0777);
$failed++;
--- 142,148 ----
}

! echo '<p>Testing <b>topics</b> directory ' . $_CONF['path_images'] . 'topics/ ...<br' . XHTML . '>' . LB;
if (!$file = @fopen ($_CONF['path_images'] . 'topics/test.gif', 'w')) {
! echo '<font color="#ff0000">Could not write to <b>' . $_CONF['path_images'] . 'topics/</b>.</font><br' . XHTML . '>Please make sure this directory exists and is set to <b>chmod 775</b>.<br' . XHTML . '>' . LB;
echo 'Current permissions for <b>topics</b>: ' . sprintf ("%3o", @fileperms ($_CONF['path_images'] . 'articles/') & 0777);
$failed++;
***************
*** 157,163 ****

if ($_CONF['pdf_enabled'] != 0) {
! echo '<p>Testing <b>pdfs</b> directory ' . $_CONF['path_pdf'] . ' ...<br>' . LB;
if (!$file = @fopen ($_CONF['path_pdf'] . 'test.pdf', 'w')) {
! echo '<font color="#ff0000">Could not write to <b>' . $_CONF['path_pdf'] . '</b>.</font><br>Please make sure this directory exists and is set to <b>chmod 775</b>.<br>' . LB;
echo 'Current permissions for <b>pdfs</b>: ' . sprintf ("%3o", @fileperms ($_CONF['path_pdf']) & 0777);
$failed++;
--- 157,163 ----

if ($_CONF['pdf_enabled'] != 0) {
! echo '<p>Testing <b>pdfs</b> directory ' . $_CONF['path_pdf'] . ' ...<br' . XHTML . '>' . LB;
if (!$file = @fopen ($_CONF['path_pdf'] . 'test.pdf', 'w')) {
! echo '<font color="#ff0000">Could not write to <b>' . $_CONF['path_pdf'] . '</b>.</font><br' . XHTML . '>Please make sure this directory exists and is set to <b>chmod 775</b>.<br' . XHTML . '>' . LB;
echo 'Current permissions for <b>pdfs</b>: ' . sprintf ("%3o", @fileperms ($_CONF['path_pdf']) & 0777);
$failed++;
***************
*** 176,182 ****

if ($_CONF['allow_mysqldump'] == 1) {
! echo '<p>Testing <b>backups</b> directory ' . $_CONF['backup_path'] . ' ...<br>' . LB;
if (!$file = @fopen ($_CONF['backup_path'] . 'test.txt', 'w')) {
! echo '<font color="#ff0000">Could not write to <b>' . $_CONF['backup_path'] . '</b>.</font><br>Please make sure this directory exists and is set to <b>chmod 775</b>.<br>' . LB;
echo 'Current permissions for <b>backups</b>: ' . sprintf ("%3o", @fileperms ($_CONF['backup_path']) & 0777);
$failed++;
--- 176,182 ----

if ($_CONF['allow_mysqldump'] == 1) {
! echo '<p>Testing <b>backups</b> directory ' . $_CONF['backup_path'] . ' ...<br' . XHTML . '>' . LB;
if (!$file = @fopen ($_CONF['backup_path'] . 'test.txt', 'w')) {
! echo '<font color="#ff0000">Could not write to <b>' . $_CONF['backup_path'] . '</b>.</font><br' . XHTML . '>Please make sure this directory exists and is set to <b>chmod 775</b>.<br' . XHTML . '>' . LB;
echo 'Current permissions for <b>backups</b>: ' . sprintf ("%3o", @fileperms ($_CONF['backup_path']) & 0777);
$failed++;
***************
*** 192,198 ****
}

! echo '<p>Testing <b>data</b> directory ' . $_CONF['path_data'] . ' ...<br>' . LB;
if (!$file = @fopen ($_CONF['path_data'] . 'test.txt', 'w')) {
! echo '<font color="#ff0000">Could not write to <b>' . $_CONF['path_data'] . '</b>.</font><br>Please make sure this directory exists and is set to <b>chmod 775</b>.<br>' . LB;
echo 'Current permissions for <b>data</b>: ' . sprintf ("%3o", @fileperms ($_CONF['path_data']) & 0777);
$failed++;
--- 192,198 ----
}

! echo '<p>Testing <b>data</b> directory ' . $_CONF['path_data'] . ' ...<br' . XHTML . '>' . LB;
if (!$file = @fopen ($_CONF['path_data'] . 'test.txt', 'w')) {
! echo '<font color="#ff0000">Could not write to <b>' . $_CONF['path_data'] . '</b>.</font><br' . XHTML . '>Please make sure this directory exists and is set to <b>chmod 775</b>.<br' . XHTML . '>' . LB;
echo 'Current permissions for <b>data</b>: ' . sprintf ("%3o", @fileperms ($_CONF['path_data']) & 0777);
$failed++;

Index: help.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/install/help.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** help.php 6 Sep 2007 07:01:59 -0000 1.1
--- help.php 25 Nov 2007 06:58:55 -0000 1.2
***************
*** 43,56 ****
define("LB", "\n");
}
$language = (isset( $_GET['language'] ) && !empty( $_GET['language'] )) ? $_GET['language'] : 'english';
require_once( 'language/' . $language . '.php' );

// $display holds all the outputted HTML and content
! $display = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
! <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
! <head>
! <meta http-equiv="Content-Type" content="text/html;charset=' . $LANG_CHARSET . '" />
! <link rel="stylesheet" type="text/css" href="layout/style.css" />
! <meta name="robots" content="noindex,nofollow" />
<title>' . $LANG_INSTALL[0] . '</title>
</head>
--- 43,65 ----
define("LB", "\n");
}
+ if ( !defined( 'XHTML' ) ) {
+ define( 'XHTML', ' /' );
+ }
+
$language = (isset( $_GET['language'] ) && !empty( $_GET['language'] )) ? $_GET['language'] : 'english';
require_once( 'language/' . $language . '.php' );

// $display holds all the outputted HTML and content
! if ( defined( 'XHTML' ) ) {
! $display = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
! <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">';
! } else {
! $display = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
! <html>';
! }
! $display .= '<head>
! <meta http-equiv="Content-Type" content="text/html;charset=' . $LANG_CHARSET . '"' . XHTML . '>
! <link rel="stylesheet" type="text/css" href="layout/style.css"' . XHTML . '>
! <meta name="robots" content="noindex,nofollow"' . XHTML . '>
<title>' . $LANG_INSTALL[0] . '</title>
</head>
***************
*** 66,73 ****
<tr>
<td class="header-logobg-left">
! <a href="http://www.geeklog.net/"><img src="layout/logo.png" width="151" height="56" alt="Geeklog" border="0" /></a>
</td>
<td class="header-logobg-right">
! <div class="site-slogan">' . $LANG_INSTALL[2] . ' <br /><br />
</td>
</tr>
--- 75,82 ----
<tr>
<td class="header-logobg-left">
! <a href="http://www.geeklog.net/"><img src="layout/logo.png" width="151" height="56" alt="Geeklog" border="0"' . XHTML . '></a>
</td>
<td class="header-logobg-right">
! <div class="site-slogan">' . $LANG_INSTALL[2] . ' <br' . XHTML . '><br' . XHTML . '>
</td>
</tr>
***************
*** 78,115 ****
<h1 class="heading">' . $LANG_HELP[0] . '</h1>
<h2><a name="site_name">' . $LANG_INSTALL[32] . '</a></h2>
! <p>' . $LANG_HELP[1] . '</p><br />

<h2><a name="site_slogan">' . $LANG_INSTALL[33] . '</a></h2>
! <p>' . $LANG_HELP[2] . '</p><br />

<h2><a name="db_type">' . $LANG_INSTALL[34] . '</a></h2>
! <p>' . $LANG_HELP[3] . '</p><br />

<h2><a name="db_host">' . $LANG_INSTALL[39] . '</a></h2>
! <p>' . $LANG_HELP[4] . '</p><br />

<h2><a name="db_name">' . $LANG_INSTALL[40] . '</a></h2>
! <p>' . $LANG_HELP[5] . '</p><br />

<h2><a name="db_user">' . $LANG_INSTALL[41] . '</a></h2>
! <p>' . $LANG_HELP[6] . '</p><br />

<h2><a name="db_pass">' . $LANG_INSTALL[42] . '</a></h2>
! <p>' . $LANG_HELP[7] . '</p><br />

<h2><a name="db_prefix">' . $LANG_INSTALL[43] . '</a></h2>
! <p>' . $LANG_HELP[8] . '</p><br />

<h2><a name="site_url">' . $LANG_INSTALL[45] . '</a></h2>
! <p>' . $LANG_HELP[9] . '</p><br />

<h2><a name="site_admin_url">' . $LANG_INSTALL[47] . '</a></h2>
! <p>' . $LANG_HELP[10] . '</p><br />

<h2><a name="site_mail">' . $LANG_INSTALL[48] . '</a></h2>
! <p>' . $LANG_HELP[11] . '</p><br />

<h2><a name="noreply_mail">' . $LANG_INSTALL[49] . '</a></h2>
! <p>' . $LANG_HELP[12] . '</p><br />

</div>
--- 87,124 ----
<h1 class="heading">' . $LANG_HELP[0] . '</h1>
<h2><a name="site_name">' . $LANG_INSTALL[32] . '</a></h2>
! <p>' . $LANG_HELP[1] . '</p><br' . XHTML . '>

<h2><a name="site_slogan">' . $LANG_INSTALL[33] . '</a></h2>
! <p>' . $LANG_HELP[2] . '</p><br' . XHTML . '>

<h2><a name="db_type">' . $LANG_INSTALL[34] . '</a></h2>
! <p>' . $LANG_HELP[3] . '</p><br' . XHTML . '>

<h2><a name="db_host">' . $LANG_INSTALL[39] . '</a></h2>
! <p>' . $LANG_HELP[4] . '</p><br' . XHTML . '>

<h2><a name="db_name">' . $LANG_INSTALL[40] . '</a></h2>
! <p>' . $LANG_HELP[5] . '</p><br' . XHTML . '>

<h2><a name="db_user">' . $LANG_INSTALL[41] . '</a></h2>
! <p>' . $LANG_HELP[6] . '</p><br' . XHTML . '>

<h2><a name="db_pass">' . $LANG_INSTALL[42] . '</a></h2>
! <p>' . $LANG_HELP[7] . '</p><br' . XHTML . '>

<h2><a name="db_prefix">' . $LANG_INSTALL[43] . '</a></h2>
! <p>' . $LANG_HELP[8] . '</p><br' . XHTML . '>

<h2><a name="site_url">' . $LANG_INSTALL[45] . '</a></h2>
! <p>' . $LANG_HELP[9] . '</p><br' . XHTML . '>

<h2><a name="site_admin_url">' . $LANG_INSTALL[47] . '</a></h2>
! <p>' . $LANG_HELP[10] . '</p><br' . XHTML . '>

<h2><a name="site_mail">' . $LANG_INSTALL[48] . '</a></h2>
! <p>' . $LANG_HELP[11] . '</p><br' . XHTML . '>

<h2><a name="noreply_mail">' . $LANG_INSTALL[49] . '</a></h2>
! <p>' . $LANG_HELP[12] . '</p><br' . XHTML . '>

</div>

Index: success.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/install/success.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** success.php 6 Sep 2007 06:50:22 -0000 1.16
--- success.php 25 Nov 2007 06:58:55 -0000 1.17
***************
*** 38,41 ****
--- 38,44 ----

require_once ('../../lib-common.php');
+ if ( !defined( 'XHTML' ) ) {
+ define( 'XHTML', ' /' );
+ }

$type = (isset( $_GET['type'] ) && !empty( $_GET['type'] )) ? $_GET['type'] : 'install';
***************
*** 53,58 ****
if ($type == 'install') {
$display .= '<p>' . $LANG_SUCCESS[5] . '</p>
! <p>' . $LANG_SUCCESS[6] . ' <strong>' . $LANG_SUCCESS[7] . '</strong><br />
! ' . $LANG_SUCCESS[8] . ' <strong>' . $LANG_SUCCESS[9] . '</strong></p> <br />';
}

--- 56,61 ----
if ($type == 'install') {
$display .= '<p>' . $LANG_SUCCESS[5] . '</p>
! <p>' . $LANG_SUCCESS[6] . ' <strong>' . $LANG_SUCCESS[7] . '</strong><br' . XHTML . '>
! ' . $LANG_SUCCESS[8] . ' <strong>' . $LANG_SUCCESS[9] . '</strong></p> <br' . XHTML . '>';
}


Index: index.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/install/index.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** index.php 27 Oct 2007 01:12:32 -0000 1.20
--- index.php 25 Nov 2007 06:58:55 -0000 1.21
***************
*** 53,56 ****
--- 53,59 ----
define('VERSION', '1.4.2');
}
+ if ( !defined( 'XHTML' ) ) {
+ define( 'XHTML', ' /' );
+ }

/**
***************
*** 175,204 ****
<h2>' . $LANG_INSTALL[31] . '</h2>
<form action="index.php" method="post">
! <input type="hidden" name="mode" value="' . $install_type . '" />
! <input type="hidden" name="step" value="2" />
! <input type="hidden" name="language" value="' . $language . '" />
! <input type="hidden" name="dbconfig_path" value="' . $dbconfig_path . '" />

! <p><label>' . $LANG_INSTALL[32] . ' ' . INST_helpLink('site_name') . '</label> <input type="text" name="site_name" value="' . $site_name . '" size="40" /></p>
! <p><label>' . $LANG_INSTALL[33] . ' ' . INST_helpLink('') . '</label> <input type="text" name="site_slogan" value="' . $site_slogan . '" size="40" /></p><br />
<p><label>' . $LANG_INSTALL[34] . ' ' . INST_helpLink('') . '</label> <select name="db_type">
<option value="mysql"' . $mysql_selected . '>' . $LANG_INSTALL[35] . '</option>
' . ($install_type == 'install' ? '<option value="mysql-innodb"' . $msyql_innodb_selected . '>' . $LANG_INSTALL[36] . '</option>' : '') . '
<option value="mssql"' . $mssql_selected . '>' . $LANG_INSTALL[37] . '</option></select> ' . $innodbnote . '</p>
! <p><label>' . $LANG_INSTALL[39] . ' ' . INST_helpLink('') . '</label> <input type="text" name="db_host" value="'. $db_host .'" size="20" /></p>
! <p><label>' . $LANG_INSTALL[40] . ' ' . INST_helpLink('') . '</label> <input type="text" name="db_name" value="'. $db_name . '" size="20" /></p>
! <p><label>' . $LANG_INSTALL[41] . ' ' . INST_helpLink('') . '</label> <input type="text" name="db_user" value="' . $db_user . '" size="20" /></p>
! <p><label>' . $LANG_INSTALL[42] . ' ' . INST_helpLink('') . '</label> <input type="password" name="db_pass" value="' . $db_pass . '" size="20" /></p>
! <p><label>' . $LANG_INSTALL[43] . ' ' . INST_helpLink('') . '</label> <input type="text" name="db_prefix" value="' . $db_prefix . '" size="20" /></p>

! <br />
<h2>' . $LANG_INSTALL[44] . '</h2>
! <p><label>' . $LANG_INSTALL[45] . ' ' . INST_helpLink('') . '</label> <input type="text" name="site_url" value="' . $site_url . '" size="50" /> &nbsp; ' . $LANG_INSTALL[46] . '</p>
! <p><label>' . $LANG_INSTALL[47] . ' ' . INST_helpLink('') . '</label> <input type="text" name="site_admin_url" value="' . $site_admin_url . '" size="50" /> &nbsp; ' . $LANG_INSTALL[46] . '</p>
! <p><label>' . $LANG_INSTALL[48] . ' ' . INST_helpLink('') . '</label> <input type="text" name="site_mail" value="' . $site_mail . '" size="50" /></p>
! <p><label>' . $LANG_INSTALL[49] . ' ' . INST_helpLink('') . '</label> <input type="text" name="noreply_mail" value="' . $noreply_mail . '" size="50" /></p>

! <br />
! <input type="submit" name="submit" class="submit" value="' . $buttontext . ' &gt;&gt;" />
</form>' . LB;
break;
--- 178,207 ----
<h2>' . $LANG_INSTALL[31] . '</h2>
<form action="index.php" method="post">
! <input type="hidden" name="mode" value="' . $install_type . '"' . XHTML . '>
! <input type="hidden" name="step" value="2"' . XHTML . '>
! <input type="hidden" name="language" value="' . $language . '"' . XHTML . '>
! <input type="hidden" name="dbconfig_path" value="' . $dbconfig_path . '"' . XHTML . '>

! <p><label>' . $LANG_INSTALL[32] . ' ' . INST_helpLink('site_name') . '</label> <input type="text" name="site_name" value="' . $site_name . '" size="40"' . XHTML . '></p>
! <p><label>' . $LANG_INSTALL[33] . ' ' . INST_helpLink('') . '</label> <input type="text" name="site_slogan" value="' . $site_slogan . '" size="40"' . XHTML . '></p><br' . XHTML . '>
<p><label>' . $LANG_INSTALL[34] . ' ' . INST_helpLink('') . '</label> <select name="db_type">
<option value="mysql"' . $mysql_selected . '>' . $LANG_INSTALL[35] . '</option>
' . ($install_type == 'install' ? '<option value="mysql-innodb"' . $msyql_innodb_selected . '>' . $LANG_INSTALL[36] . '</option>' : '') . '
<option value="mssql"' . $mssql_selected . '>' . $LANG_INSTALL[37] . '</option></select> ' . $innodbnote . '</p>
! <p><label>' . $LANG_INSTALL[39] . ' ' . INST_helpLink('') . '</label> <input type="text" name="db_host" value="'. $db_host .'" size="20"' . XHTML . '></p>
! <p><label>' . $LANG_INSTALL[40] . ' ' . INST_helpLink('') . '</label> <input type="text" name="db_name" value="'. $db_name . '" size="20"' . XHTML . '></p>
! <p><label>' . $LANG_INSTALL[41] . ' ' . INST_helpLink('') . '</label> <input type="text" name="db_user" value="' . $db_user . '" size="20"' . XHTML . '></p>
! <p><label>' . $LANG_INSTALL[42] . ' ' . INST_helpLink('') . '</label> <input type="password" name="db_pass" value="' . $db_pass . '" size="20"' . XHTML . '></p>
! <p><label>' . $LANG_INSTALL[43] . ' ' . INST_helpLink('') . '</label> <input type="text" name="db_prefix" value="' . $db_prefix . '" size="20"' . XHTML . '></p>

! <br' . XHTML . '>
<h2>' . $LANG_INSTALL[44] . '</h2>
! <p><label>' . $LANG_INSTALL[45] . ' ' . INST_helpLink('') . '</label> <input type="text" name="site_url" value="' . $site_url . '" size="50"' . XHTML . '> &nbsp; ' . $LANG_INSTALL[46] . '</p>
! <p><label>' . $LANG_INSTALL[47] . ' ' . INST_helpLink('') . '</label> <input type="text" name="site_admin_url" value="' . $site_admin_url . '" size="50"' . XHTML . '> &nbsp; ' . $LANG_INSTALL[46] . '</p>
! <p><label>' . $LANG_INSTALL[48] . ' ' . INST_helpLink('') . '</label> <input type="text" name="site_mail" value="' . $site_mail . '" size="50"' . XHTML . '></p>
! <p><label>' . $LANG_INSTALL[49] . ' ' . INST_helpLink('') . '</label> <input type="text" name="noreply_mail" value="' . $noreply_mail . '" size="50"' . XHTML . '></p>

! <br' . XHTML . '>
! <input type="submit" name="submit" class="submit" value="' . $buttontext . ' &gt;&gt;"' . XHTML . '>
</form>' . LB;
break;
***************
*** 305,309 ****
require_once $_CONF['path_system'] . 'lib-database.php';
$req_string = 'index.php?mode=' . $install_type . '&step=3&dbconfig_path=' . $dbconfig_path
! . '&language=' . $language
. '&site_name=' . urlencode($site_name)
. '&site_slogan=' . urlencode($site_slogan)
--- 308,312 ----
require_once $_CONF['path_system'] . 'lib-database.php';
$req_string = 'index.php?mode=' . $install_type . '&step=3&dbconfig_path=' . $dbconfig_path
! . '&amp;language=' . $language
. '&site_name=' . urlencode($site_name)
. '&site_slogan=' . urlencode($site_slogan)
***************
*** 316,328 ****

case 'install':
! $hidden_fields = '<input type="hidden" name="mode" value="' . $install_type . '" />
! <input type="hidden" name="language" value="' . $language . '" />
! <input type="hidden" name="dbconfig_path" value="' . urlencode($dbconfig_path) . '" />
! <input type="hidden" name="site_name" value="' . urlencode($site_name) . '" />
! <input type="hidden" name="site_slogan" value="' . urlencode($site_slogan) . '" />
! <input type="hidden" name="site_url" value="' . urlencode($site_url) . '" />
! <input type="hidden" name="site_admin_url" value="' . urlencode($site_admin_url) . '" />
! <input type="hidden" name="site_mail" value="' . urlencode($site_mail) . '" />
! <input type="hidden" name="noreply_mail" value="' . urlencode($noreply_mail) . '" />';

// If using MySQL check to see if InnoDB is supported
--- 319,331 ----

case 'install':
! $hidden_fields = '<input type="hidden" name="mode" value="' . $install_type . '"' . XHTML . '>
! <input type="hidden" name="language" value="' . $language . '"' . XHTML . '>
! <input type="hidden" name="dbconfig_path" value="' . urlencode($dbconfig_path) . '"' . XHTML . '>
! <input type="hidden" name="site_name" value="' . urlencode($site_name) . '"' . XHTML . '>
! <input type="hidden" name="site_slogan" value="' . urlencode($site_slogan) . '"' . XHTML . '>
! <input type="hidden" name="site_url" value="' . urlencode($site_url) . '"' . XHTML . '>
! <input type="hidden" name="site_admin_url" value="' . urlencode($site_admin_url) . '"' . XHTML . '>
! <input type="hidden" name="site_mail" value="' . urlencode($site_mail) . '"' . XHTML . '>
! <input type="hidden" name="noreply_mail" value="' . urlencode($noreply_mail) . '"' . XHTML . '>';

// If using MySQL check to see if InnoDB is supported
***************
*** 332,342 ****
<p>' . $LANG_INSTALL['60'] . '</p>

! <br />
<div style="margin-left: auto; margin-right: auto; width: 125px">
<div style="position: relative; right: 10px">
<form action="index.php" method="post">
! <input type="hidden" name="step" value="1" />
' . $hidden_fields . '
! <input type="submit" value="&lt;&lt; ' . $LANG_INSTALL[61] . '" />
</form>
</div>
--- 335,345 ----
<p>' . $LANG_INSTALL['60'] . '</p>

! <br' . XHTML . '>
<div style="margin-left: auto; margin-right: auto; width: 125px">
<div style="position: relative; right: 10px">
<form action="index.php" method="post">
! <input type="hidden" name="step" value="1"' . XHTML . '>
' . $hidden_fields . '
! <input type="submit" value="&lt;&lt; ' . $LANG_INSTALL[61] . '"' . XHTML . '>
</form>
</div>
***************
*** 344,351 ****
<div style="position: relative; left: 65px; top: -27px">
<form action="index.php" method="post">
! <input type="hidden" name="step" value="3" />
' . $hidden_fields . '
! <input type="hidden" name="innodb" value="false" />
! <input type="submit" name="submit" value="' . $LANG_INSTALL[62] . ' &gt;&gt;" />
</form>
</div>
--- 347,354 ----
<div style="position: relative; left: 65px; top: -27px">
<form action="index.php" method="post">
! <input type="hidden" name="step" value="3"' . XHTML . '>
' . $hidden_fields . '
! <input type="hidden" name="innodb" value="false"' . XHTML . '>
! <input type="submit" name="submit" value="' . $LANG_INSTALL[62] . ' &gt;&gt;"' . XHTML . '>
</form>
</div>
***************
*** 377,383 ****
<p>' . $LANG_INSTALL[77] . '</p>
<form action="index.php" method="post">
! <input type="hidden" name="mode" value="upgrade" />
! <input type="hidden" name="step" value="3" />
! <input type="hidden" name="dbconfig_path" value="' . $dbconfig_path . '" />
<p><label>Current Version:</label> <select name="version">';
$tmp_counter = 0;
--- 380,386 ----
<p>' . $LANG_INSTALL[77] . '</p>
<form action="index.php" method="post">
! <input type="hidden" name="mode" value="upgrade"' . XHTML . '>
! <input type="hidden" name="step" value="3"' . XHTML . '>
! <input type="hidden" name="dbconfig_path" value="' . $dbconfig_path . '"' . XHTML . '>
<p><label>Current Version:</label> <select name="version">';
$tmp_counter = 0;
***************
*** 391,396 ****
}
$display .= '</select></p>
! <br />
! <input type="submit" name="submit" class="submit" value="Upgrade &gt;&gt;" />
</form>' . LB;

--- 394,399 ----
}
$display .= '</select></p>
! <br' . XHTML . '>
! <input type="submit" name="submit" class="submit" value="Upgrade &gt;&gt;"' . XHTML . '>
</form>' . LB;

***************
*** 442,451 ****
<div style="position: absolute">
<form action="index.php" method="post">
! <input type="hidden" name="mode" value="install" />
! <input type="hidden" name="step" value="3" />
! <input type="hidden" name="language" value="' . $language . '" />
! <input type="hidden" name="dbconfig_path" value="' . $dbconfig_path . '" />
! <input type="hidden" name="innodb" value="' . (($use_innodb) ? 'true' : 'false') . '" />
! <input type="submit" value="' . $LANG_INSTALL[66] . '" />
</form>
</div>
--- 445,454 ----
<div style="position: absolute">
<form action="index.php" method="post">
! <input type="hidden" name="mode" value="install"' . XHTML . '>
! <input type="hidden" name="step" value="3"' . XHTML . '>
! <input type="hidden" name="language" value="' . $language . '"' . XHTML . '>
! <input type="hidden" name="dbconfig_path" value="' . $dbconfig_path . '"' . XHTML . '>
! <input type="hidden" name="innodb" value="' . (($use_innodb) ? 'true' : 'false') . '"' . XHTML . '>
! <input type="submit" value="' . $LANG_INSTALL[66] . '"' . XHTML . '>
</form>
</div>
***************
*** 453,459 ****
<div style="position: relative; left: 55px; top: 5px">
<form action="index.php" method="post">
! <input type="hidden" name="mode" value="upgrade" />
! <input type="hidden" name="language" value="' . $language . '" />
! <input type="submit" value="' . $LANG_INSTALL[25] . '" />
</form>
</div>
--- 456,462 ----
<div style="position: relative; left: 55px; top: 5px">
<form action="index.php" method="post">
! <input type="hidden" name="mode" value="upgrade"' . XHTML . '>
! <input type="hidden" name="language" value="' . $language . '"' . XHTML . '>
! <input type="submit" value="' . $LANG_INSTALL[25] . '"' . XHTML . '>
</form>
</div>
***************
*** 608,612 ****
<p>' . $LANG_INSTALL[82] . '</p>

! <br />
<p><label class="file-permission-list"><b>' . $LANG_INSTALL[10] . '</b></label> <b>' . $LANG_INSTALL[11] . '</b></p>
' . LB;
--- 611,615 ----
<p>' . $LANG_INSTALL[82] . '</p>

! <br' . XHTML . '>
<p><label class="file-permission-list"><b>' . $LANG_INSTALL[10] . '</b></label> <b>' . $LANG_INSTALL[11] . '</b></p>
' . LB;
***************
*** 626,630 ****
</div>

! <br /><br />' . LB;

return $display;
--- 629,633 ----
</div>

! <br' . XHTML . '><br' . XHTML . '>' . LB;

return $display;
***************
*** 646,665 ****
$display = '
<form action="index.php" method="post">
! <input type="hidden" name="mode" value="' . $mode . '" />
! <input type="hidden" name="step" value="1" />
! <input type="hidden" name="dbconfig_path" value="' . $dbconfig_path . '" />
! <input type="hidden" name="language" value="' . $language . '" />
! <input type="hidden" name="site_name" value="' . $post_data['site_name'] . '" />
! <input type="hidden" name="site_slogan" value="' . $post_data['site_slogan'] . '" />
! <input type="hidden" name="db_type" value="' . $post_data['db_type'] . '" />
! <input type="hidden" name="db_host" value="' . $post_data['db_host'] . '" />
! <input type="hidden" name="db_name" value="' . $post_data['db_name'] . '" />
! <input type="hidden" name="db_user" value="' . $post_data['db_user'] . '" />
! <input type="hidden" name="db_prefix" value="' . $post_data['db_prefix'] . ' /">
! <input type="hidden" name="site_url" value="' . $post_data['site_url'] . '" />
! <input type="hidden" name="site_admin_url" value="' . $post_data['site_admin_url'] . '" />
! <input type="hidden" name="site_mail" value="' . $post_data['site_mail'] . '" />
! <input type="hidden" name="noreply_mail" value="' . $post_data['noreply_mail'] . '" />
! <p align="center"><input type="submit" value="&lt;&lt; ' . $LANG_INSTALL[61] . '" /></p>
</form>';

--- 649,668 ----
$display = '
<form action="index.php" method="post">
! <input type="hidden" name="mode" value="' . $mode . '"' . XHTML . '>
! <input type="hidden" name="step" value="1"' . XHTML . '>
! <input type="hidden" name="dbconfig_path" value="' . $dbconfig_path . '"' . XHTML . '>
! <input type="hidden" name="language" value="' . $language . '"' . XHTML . '>
! <input type="hidden" name="site_name" value="' . $post_data['site_name'] . '"' . XHTML . '>
! <input type="hidden" name="site_slogan" value="' . $post_data['site_slogan'] . '"' . XHTML . '>
! <input type="hidden" name="db_type" value="' . $post_data['db_type'] . '"' . XHTML . '>
! <input type="hidden" name="db_host" value="' . $post_data['db_host'] . '"' . XHTML . '>
! <input type="hidden" name="db_name" value="' . $post_data['db_name'] . '"' . XHTML . '>
! <input type="hidden" name="db_user" value="' . $post_data['db_user'] . '"' . XHTML . '>
! <input type="hidden" name="db_prefix" value="' . $post_data['db_prefix'] . '"' . XHTML . '>
! <input type="hidden" name="site_url" value="' . $post_data['site_url'] . '"' . XHTML . '>
! <input type="hidden" name="site_admin_url" value="' . $post_data['site_admin_url'] . '"' . XHTML . '>
! <input type="hidden" name="site_mail" value="' . $post_data['site_mail'] . '"' . XHTML . '>
! <input type="hidden" name="noreply_mail" value="' . $post_data['noreply_mail'] . '"' . XHTML . '>
! <p align="center"><input type="submit" value="&lt;&lt; ' . $LANG_INSTALL[61] . '"' . XHTML . '></p>
</form>';

***************
*** 810,814 ****
// Now insert mandatory data and a small subset of initial data
foreach ($_DATA as $data) {
! $progress .= "executing " . $data . "<br />\n";

DB_query ($data);
--- 813,817 ----
// Now insert mandatory data and a small subset of initial data
foreach ($_DATA as $data) {
! $progress .= "executing " . $data . "<br" . XHTML . ">\n";

DB_query ($data);
***************
*** 1339,1343 ****
$_SQL = INST_checkInnodbUpgrade($_SQL);
foreach ($_SQL as $sql) {
! $progress .= "executing " . $sql . "<br />\n";
if ($_DB_dbms == 'mssql') {
$_DB->dbQuery($sql, 0, 1);
--- 1342,1346 ----
$_SQL = INST_checkInnodbUpgrade($_SQL);
foreach ($_SQL as $sql) {
! $progress .= "executing " . $sql . "<br" . XHTML . ">\n";
if ($_DB_dbms == 'mssql') {
$_DB->dbQuery($sql, 0, 1);
***************
*** 1389,1398 ****

// $display holds all the outputted HTML and content
! $display = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
! <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
! <head>
! <meta http-equiv="Content-Type" content="text/html;charset=' . $LANG_CHARSET . '" />
! <link rel="stylesheet" type="text/css" href="layout/style.css" />
! <meta name="robots" content="noindex,nofollow" />
<title>' . $LANG_INSTALL[0] . '</title>
</head>
--- 1392,1406 ----

// $display holds all the outputted HTML and content
! if ( defined( 'XHTML' ) ) {
! $display = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
! <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">';
! } else {
! $display = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
! <html>';
! }
! $display .= '<head>
! <meta http-equiv="Content-Type" content="text/html;charset=' . $LANG_CHARSET . '"' . XHTML . '>
! <link rel="stylesheet" type="text/css" href="layout/style.css"' . XHTML . '>
! <meta name="robots" content="noindex,nofollow"' . XHTML . '>
<title>' . $LANG_INSTALL[0] . '</title>
</head>
***************
*** 1408,1415 ****
<tr>
<td class="header-logobg-left">
! <a href="http://www.geeklog.net/"><img src="layout/logo.png" width="151" height="56" alt="Geeklog" border="0" /></a>
</td>
<td class="header-logobg-right">
! <div class="site-slogan">' . $LANG_INSTALL[2] . ' <br /><br />' . LB;

// Show the language drop down selection on the first page
--- 1416,1423 ----
<tr>
<td class="header-logobg-left">
! <a href="http://www.geeklog.net/"><img src="layout/logo.png" width="151" height="56" alt="Geeklog" border="0"' . XHTML . '></a>
</td>
<td class="header-logobg-right">
! <div class="site-slogan">' . $LANG_INSTALL[2] . ' <br' . XHTML . '><br' . XHTML . '>' . LB;

// Show the language drop down selection on the first page
***************
*** 1420,1429 ****
if (isset($_GET['mode']) || isset($_POST['mode'])) {
$value = (isset($_POST['mode'])) ? $_POST['mode'] : $_GET['mode'];
! $display .= '<input type="hidden" name="mode" value="' . $value . '" />' . LB;
}
foreach ($_PATH as $name) {
if (isset($_GET[$name . '_path']) || isset($_POST[$name . '_path'])) {
$value = (isset($_POST[$name . '_path'])) ? $_POST[$name . '_path'] : $_GET[$name . '_path'];
! $display .= '<input type="hidden" name="' . $name .'_path" value="' . $value . '" />' . LB;
}
}
--- 1428,1437 ----
if (isset($_GET['mode']) || isset($_POST['mode'])) {
$value = (isset($_POST['mode'])) ? $_POST['mode'] : $_GET['mode'];
! $display .= '<input type="hidden" name="mode" value="' . $value . '"' . XHTML . '>' . LB;
}
foreach ($_PATH as $name) {
if (isset($_GET[$name . '_path']) || isset($_POST[$name . '_path'])) {
$value = (isset($_POST[$name . '_path'])) ? $_POST[$name . '_path'] : $_GET[$name . '_path'];
! $display .= '<input type="hidden" name="' . $name .'_path" value="' . $value . '"' . XHTML . '>' . LB;
}
}
***************
*** 1437,1444 ****

$display .= '</select>
! <input type="submit" value="' . $LANG_INSTALL[80] . '" />';
}
$display .= '
! </form></div>
</td>
</tr>
--- 1445,1453 ----

$display .= '</select>
! <input type="submit" value="' . $LANG_INSTALL[80] . '"' . XHTML . '>
! </form>';
}
$display .= '
! </div>
</td>
</tr>
***************
*** 1479,1483 ****
// or in public_html have the user enter its location.
$form_fields .= '<p><label>db-config.php</label> <input type="text" name="dbconfig_path" value="/path/to/'
! . $dbconfig_file . '" size="25" /></p>' . LB;
$num_errors++;
} else {
--- 1488,1492 ----
// or in public_html have the user enter its location.
$form_fields .= '<p><label>db-config.php</label> <input type="text" name="dbconfig_path" value="/path/to/'
! . $dbconfig_file . '" size="25"' . XHTML . '></p>' . LB;
$num_errors++;
} else {
***************
*** 1497,1503 ****
<p>' . $LANG_INSTALL[8] . '</p>
<form action="index.php" method="post">
! <input type="hidden" name="mode" value="check_permissions" />
' . $form_fields . '
! <input type="submit" name="submit" class="submit" value="Next &gt;&gt;" />
</form>' . LB;
}
--- 1506,1512 ----
<p>' . $LANG_INSTALL[8] . '</p>
<form action="index.php" method="post">
! <input type="hidden" name="mode" value="check_permissions"' . XHTML . '>
' . $form_fields . '
! <input type="submit" name="submit" class="submit" value="Next &gt;&gt;"' . XHTML . '>
</form>' . LB;
}
***************
*** 1531,1538 ****
$display .= '<h2>' . $LANG_INSTALL[83] . '</h2>'
. $LANG_INSTALL[84] . $_PATH['db-config.php'] . $LANG_INSTALL[85]
! . '<br /><br />
<div style="margin-left: auto; margin-right: auto; width: 1px">
<form action="index.php" method="post">
! <input type="submit" value="&lt;&lt; ' . $LANG_INSTALL[61] . '" />
</form>
</div>';
--- 1540,1547 ----
$display .= '<h2>' . $LANG_INSTALL[83] . '</h2>'
. $LANG_INSTALL[84] . $_PATH['db-config.php'] . $LANG_INSTALL[85]
! . '<br' . XHTML . '><br' . XHTML . '>
<div style="margin-left: auto; margin-right: auto; width: 1px">
<form action="index.php" method="post">
! <input type="submit" value="&lt;&lt; ' . $LANG_INSTALL[61] . '"' . XHTML . '>
</form>
</div>';
***************
*** 1548,1552 ****
$data_path = $gl_path . (file_exists($gl_path . 'data') ? 'data/' : 'public_html/data/');
$failed = 0; // number of failed tests
! $display_permissions = '<br /><p><label class="file-permission-list"><b>' . $LANG_INSTALL[10]
. '</b></label> <b>' . $LANG_INSTALL[11] . '</b></p>' . LB;
$_PERMS = array('db-config.php', 'siteconfig.php', 'error.log', 'access.log',
--- 1557,1561 ----
$data_path = $gl_path . (file_exists($gl_path . 'data') ? 'data/' : 'public_html/data/');
$failed = 0; // number of failed tests
! $display_permissions = '<br' . XHTML . '><p><label class="file-permission-list"><b>' . $LANG_INSTALL[10]
. '</b></label> <b>' . $LANG_INSTALL[11] . '</b></p>' . LB;
$_PERMS = array('db-config.php', 'siteconfig.php', 'error.log', 'access.log',
***************
*** 1674,1678 ****


! $display .= $LANG_INSTALL[9] . '<br /><br />' . LB;

if ($failed) {
--- 1683,1687 ----


! $display .= $LANG_INSTALL[9] . '<br' . XHTML . '><br' . XHTML . '>' . LB;

if ($failed) {
***************
*** 1680,1686 ****
$display .= '
<p>' . $LANG_INSTALL[19] . '</p>
! ' . $display_permissions . '<br /><p><strong><span class="error">' . $LANG_INSTALL[20] . '</span></strong>
' . $LANG_INSTALL[21] . '</p>
! <br /><br />' . LB;

}
--- 1689,1695 ----
$display .= '
<p>' . $LANG_INSTALL[19] . '</p>
! ' . $display_permissions . '<br' . XHTML . '><p><strong><span class="error">' . $LANG_INSTALL[20] . '</span></strong>
' . $LANG_INSTALL[21] . '</p>
! <br' . XHTML . '><br' . XHTML . '>' . LB;

}
***************
*** 1689,1694 ****
$req_string = 'index.php?mode=write_paths'
. '&dbconfig_path=' . urlencode($_PATH['db-config.php'])
! . '&public_html_path=' . urlencode($_PATH['public_html/'])
! . '&language=' . $language;

$display .= '
--- 1698,1703 ----
$req_string = 'index.php?mode=write_paths'
. '&dbconfig_path=' . urlencode($_PATH['db-config.php'])
! . '&amp;public_html_path=' . urlencode($_PATH['public_html/'])
! . '&amp;language=' . $language;

$display .= '
***************
*** 1696,1703 ****
<div class="install-type-container-inner">
<h2>' . $LANG_INSTALL[23] . '</h2>
! <div class="install" onmouseover="this.style.background=\'#BBB\'" onmouseout="this.style.background=\'#CCC\'"><a id="install" href="'
! . $req_string . '&op=install">' . $LANG_INSTALL[24] . '</a></div>
! <div class="upgrade" onmouseover="this.style.background=\'#BBB\'" onmouseout="this.style.background=\'#CCC\'"><a id="install" href="'
! . $req_string . '&op=upgrade">' . $LANG_INSTALL[25] . '</a></div>
</div>
</div>' . LB;
--- 1705,1712 ----
<div class="install-type-container-inner">
<h2>' . $LANG_INSTALL[23] . '</h2>
! <div class="install" onmouseover="this.style.background=\'#BBB\'" onmouseout="this.style.background=\'#CCC\'"><a class="install" href="'
! . $req_string . '&amp;op=install">' . $LANG_INSTALL[24] . '</a></div>
! <div class="upgrade" onmouseover="this.style.background=\'#BBB\'" onmouseout="this.style.background=\'#CCC\'"><a class="install" href="'
! . $req_string . '&amp;op=upgrade">' . $LANG_INSTALL[25] . '</a></div>
</div>
</div>' . LB;
***************
*** 1746,1750 ****

// Continue to the next step: Fresh install or Upgrade
! header('Location: index.php?mode=' . $_GET['op'] . '&dbconfig_path=' . urlencode($_PATH['db-config.php']) . '&language=' . $language);

}
--- 1755,1759 ----

// Continue to the next step: Fresh install or Upgrade
! header('Location: index.php?mode=' . $_GET['op'] . '&dbconfig_path=' . urlencode($_PATH['db-config.php']) . '&amp;language=' . $language);

}
***************
*** 1762,1766 ****

$display .= '
! <br /><br />
</div>
</div>
--- 1771,1775 ----

$display .= '
! <br' . XHTML . '><br' . XHTML . '>
</div>
</div>


More information about the geeklog-cvs mailing list