[geeklog-cvs] Geeklog-1.x/public_html/admin/install index.php, 1.11, 1.12
Dirk Haun
dhaun at qs1489.pair.com
Sun Sep 2 07:07:26 EDT 2007
Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install
In directory qs1489.pair.com:/tmp/cvs-serv8145
Modified Files:
index.php
Log Message:
Get character set and text of the "Back" button from the language file; a minor optimization
Index: index.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install/index.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** index.php 2 Sep 2007 08:39:20 -0000 1.11
--- index.php 2 Sep 2007 11:07:24 -0000 1.12
***************
*** 641,645 ****
function INST_showReturnFormData($post_data)
{
! global $mode, $dbconfig_path, $language;
$display = '
--- 641,645 ----
function INST_showReturnFormData($post_data)
{
! global $mode, $dbconfig_path, $language, $LANG_INSTALL;
$display = '
***************
*** 660,665 ****
<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="<< Back" /></p>
</form>';
return $display;
}
--- 660,666 ----
<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="<< ' . $LANG_INSTALL[61] . '" /></p>
</form>';
+
return $display;
}
***************
*** 1287,1303 ****
*
*/
! function INST_updateDB($_SQL) {
global $progress, $_DB, $_DB_dbms;
$_SQL = INST_checkInnodbUpgrade($_SQL);
! for ($i = 1; $i <= count($_SQL); $i++) {
! $progress .= "executing " . current($_SQL) . "<br />\n";
if ($_DB_dbms == 'mssql') {
! $_DB->dbQuery(current($_SQL), 0, 1);
} else {
! DB_query(current($_SQL));
}
- next($_SQL);
}
-
}
--- 1288,1304 ----
*
*/
! function INST_updateDB($_SQL)
! {
global $progress, $_DB, $_DB_dbms;
+
$_SQL = INST_checkInnodbUpgrade($_SQL);
! foreach ($_SQL as $sql) {
! $progress .= "executing " . $sql . "<br />\n";
if ($_DB_dbms == 'mssql') {
! $_DB->dbQuery($sql, 0, 1);
} else {
! DB_query($sql);
}
}
}
***************
*** 1330,1334 ****
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
! <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<link rel="stylesheet" type="text/css" href="layout/style.css" />
<meta name="robots" content="noindex,nofollow" />
--- 1331,1335 ----
<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" />
More information about the geeklog-cvs
mailing list