[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] setup/manageheader.php, 1.49
|
From: |
nomail |
|
Subject: |
[Phpgroupware-cvs] setup/manageheader.php, 1.49 |
|
Date: |
Thu, 30 Dec 2004 10:37:36 +0100 |
Update of /setup
Modified Files:
Branch:
manageheader.php
date: 2004/12/30 09:37:36; author: fipsfuchs; state: Exp; lines: +41 -41
Log Message:
xhtml1trans compliance from powerstat
=====================================================================
Index: setup/manageheader.php
diff -u setup/manageheader.php:1.48 setup/manageheader.php:1.49
--- setup/manageheader.php:1.48 Thu Dec 30 08:43:15 2004
+++ setup/manageheader.php Thu Dec 30 09:37:36 2004
@@ -45,14 +45,14 @@
//$dom = get_var("settings['$k']", Array('POST'));
if(!$_POST['settings'][$k]['config_pass'])
{
- $errors .= '<br>' . lang("You didn't enter a
config password for domain %1",$v);
+ $errors .= '<br />' . lang("You didn't enter a
config password for domain %1",$v);
}
}
$setting = get_var('setting',Array('POST'));
if(!$setting['HEADER_ADMIN_PASSWORD'])
{
- $errors .= '<br>' . lang("You didn't enter a header
admin password");
+ $errors .= '<br />' . lang("You didn't enter a header
admin password");
}
if($errors)
@@ -82,14 +82,14 @@
$setup_tpl->set_block('T_setup_manage','manageheader','manageheader');
$setup_tpl->set_block('T_setup_manage','domain','domain');
- $setup_tpl->set_var('HeaderLoginWarning', lang('Warning: All your
passwords (database, phpGroupWare admin,...)<br> will be shown in plain text
after you log in for header administration.'));
+ $setup_tpl->set_var('HeaderLoginWarning', lang('Warning: All your
passwords (database, phpGroupWare admin,...)<br /> will be shown in plain text
after you log in for header administration.'));
/* Detect current mode */
switch($GLOBALS['phpgw_info']['setup']['stage']['header'])
{
case '1':
$GLOBALS['phpgw_info']['setup']['HeaderFormMSG'] =
lang('Create your header.inc.php');
- $GLOBALS['phpgw_info']['setup']['PageMSG'] = lang('You
have not created your header.inc.php yet!<br> You can create it now.');
+ $GLOBALS['phpgw_info']['setup']['PageMSG'] = lang('You
have not created your header.inc.php yet!<br /> You can create it now.');
break;
case '2':
$GLOBALS['phpgw_info']['setup']['HeaderFormMSG'] =
lang('Your header admin password is NOT set. Please set it now!');
@@ -97,7 +97,7 @@
break;
case '3':
$GLOBALS['phpgw_info']['setup']['HeaderFormMSG'] =
lang('Your header.inc.php needs upgrading.');
- $GLOBALS['phpgw_info']['setup']['PageMSG'] = lang('Your
header.inc.php needs upgrading.<br><blink><b
class="msg">WARNING!</b></blink><br><b>MAKE BACKUPS!</b>');
+ $GLOBALS['phpgw_info']['setup']['PageMSG'] = lang('Your
header.inc.php needs upgrading.<br /><blink><b
class="msg">WARNING!</b></blink><br /><b>MAKE BACKUPS!</b>');
$GLOBALS['phpgw_info']['setup']['HeaderLoginMSG'] =
lang('Your header.inc.php needs upgrading.');
if (!$GLOBALS['phpgw_setup']->auth('Header'))
{
@@ -142,13 +142,13 @@
check_form_values();
$header_template = CreateObject('setup.Template','../');
$GLOBALS['phpgw_setup']->html->show_header('Generated
header.inc.php', False, 'header');
- echo '<br>' . lang('Save this text as contents of your
header.inc.php') . '<br><hr>';
+ echo '<br />' . lang('Save this text as contents of
your header.inc.php') . '<br /><hr />';
$newheader =
$GLOBALS['phpgw_setup']->html->generate_header();
echo '<pre>';
echo htmlentities($newheader);
- echo '</pre><hr>';
+ echo '</pre><hr />';
echo '<form action="index.php" method="post">';
- echo '<br>' . lang('After retrieving the file, put it
into place as the header.inc.php. Then, click "continue".') . '<br>';
+ echo '<br />' . lang('After retrieving the file, put it
into place as the header.inc.php. Then, click "continue".') . '<br />';
echo '<input type="hidden" name="FormLogout"
value="header">';
echo '<input type="submit" name="junk"
value="'.lang('Continue').'">';
echo '</form>';
@@ -165,7 +165,7 @@
fclose($fsetup);
$GLOBALS['phpgw_setup']->html->show_header('Saved header.inc.php', False,
'header');
echo '<form action="index.php" method="post">';
- echo '<br>Created header.inc.php! ';
+ echo '<br />Created header.inc.php! ';
echo '<input type="hidden" name="FormLogout"
value="header">';
echo '<input type="submit" name="junk"
value="'.lang('Continue').'">';
echo '</form>';
@@ -175,8 +175,8 @@
else
{
$GLOBALS['phpgw_setup']->html->show_header('Error generating header.inc.php',
False, 'header');
- echo lang('Could not open header.inc.php for
writing!') . '<br>' . "\n";
- echo lang('Please check read/write permissions
on directories, or back up and use another option.') . '<br>';
+ echo lang('Could not open header.inc.php for
writing!') . '<br />' . "\n";
+ echo lang('Please check read/write permissions
on directories, or back up and use another option.') . '<br />';
echo '</td></tr></table></body></html>';
}
break;
@@ -188,60 +188,60 @@
if (!$ConfigLang)
{
$_POST['ConfigLang'] = 'en';
- $detected .= '<br><form
action="manageheader.php" method="Post">Please Select your language
'.lang_select(True)."</form>\n";
+ $detected .= '<br /><form
action="manageheader.php" method="Post">Please Select your language
'.lang_select(True)."</form>\n";
}
$detected .= '<table border="0" width="100%"
cellspacing="0" cellpadding="0" style="{ border: 1px solid #000000; }">' . "\n";
$detected .= '<tr><td colspan="2"><p>' .
$GLOBALS['phpgw_info']['setup']['PageMSG'] . '<br /> </p></td></tr>';
$manual = '<a href="../doc/en_US/html/admin/"
target="manual">'.lang('phpGroupWare Administration Manual').'</a>';
- $detected .= '<tr><td colspan="2"><p><b>'.lang('Please
consult the %1.',$manual).'</b><br> </td></tr>'. "\n";
+ $detected .= '<tr><td colspan="2"><p><b>'.lang('Please
consult the %1.',$manual).'</b><br /> </td></tr>'. "\n";
$detected .= '<tr class="th"><td colspan="2">' .
lang('Analysis') . '</td></tr><tr><td colspan="2">'. "\n";
$supported_db = array();
if (extension_loaded('mysql') ||
function_exists('mysql_connect'))
{
- $detected .= lang('You appear to have MySQL
support enabled') . '<br>' . "\n";
+ $detected .= lang('You appear to have MySQL
support enabled') . '<br />' . "\n";
$supported_db[] = 'mysql';
}
else
{
- $detected .= lang('No MySQL support found.
Disabling') . '<br>' . "\n";
+ $detected .= lang('No MySQL support found.
Disabling') . '<br />' . "\n";
}
if (extension_loaded('pgsql') ||
function_exists('pg_connect'))
{
- $detected .= lang('You appear to have
Postgres-DB support enabled') . '<br>' . "\n";
+ $detected .= lang('You appear to have
Postgres-DB support enabled') . '<br />' . "\n";
$supported_db[] = 'pgsql';
}
else
{
- $detected .= lang('No Postgres-DB support
found. Disabling') . '<br>' . "\n";
+ $detected .= lang('No Postgres-DB support
found. Disabling') . '<br />' . "\n";
}
if (extension_loaded('mssql') ||
function_exists('mssql_connect'))
{
- $detected .= lang('You appear to have Microsoft
SQL Server support enabled') . '<br>' . "\n";
+ $detected .= lang('You appear to have Microsoft
SQL Server support enabled') . '<br />' . "\n";
$supported_db[] = 'mssql';
}
else
{
- $detected .= lang('No Microsoft SQL Server
support found. Disabling') . '<br>' . "\n";
+ $detected .= lang('No Microsoft SQL Server
support found. Disabling') . '<br />' . "\n";
}
if (extension_loaded('oci8'))
{
- $detected .= lang('You appear to have Oracle V8
(OCI) support enabled') . '<br>' . "\n";
+ $detected .= lang('You appear to have Oracle V8
(OCI) support enabled') . '<br />' . "\n";
$supported_db[] = 'oracle';
}
else
{
if(extension_loaded('oracle'))
{
- $detected .= lang('You appear to have
Oracle support enabled') . '<br>' . "\n";
+ $detected .= lang('You appear to have
Oracle support enabled') . '<br />' . "\n";
$supported_db[] = 'oracle';
}
else
{
- $detected .= lang('No Oracle-DB support
found. Disabling') . '<br>' . "\n";
+ $detected .= lang('No Oracle-DB support
found. Disabling') . '<br />' . "\n";
}
}
if (extension_loaded('odbc') ||
function_exists('odbc_connect'))
@@ -257,7 +257,7 @@
{
$detected .= '<b><p align="center" class="msg">'
. lang('Did not find any valid DB
support!')
- . "<br>\n"
+ . "<br />\n"
. lang('Try to configure your php to
support one of the above mentioned DBMS, or install phpGroupWare by hand.')
.
'</p></b><td></tr></table></body></html>';
echo $detected;
@@ -274,7 +274,7 @@
}
else
{
- $detected .= lang('You appear to be using PHP4.
Enabling PHP4 sessions support') . '<br>' . "\n";
+ $detected .= lang('You appear to be using PHP4.
Enabling PHP4 sessions support') . '<br />' . "\n";
$supported_sessions_type[] = 'db';
$supported_sessions_type[] = 'php4';
}
@@ -282,42 +282,42 @@
/*
if (extension_loaded('xml') ||
function_exists('xml_parser_create'))
{
- $detected .= lang('You appear to have XML
support enabled') . '<br>' . "\n";
+ $detected .= lang('You appear to have XML
support enabled') . '<br />' . "\n";
$xml_enabled = 'True';
}
else
{
- $detected .= lang('No XML support found.
Disabling') . '<br>' . "\n";
+ $detected .= lang('No XML support found.
Disabling') . '<br />' . "\n";
}
*/
if(extension_loaded('imap') ||
function_exists('imap_open'))
{
- $detected .= lang('You appear to have IMAP
support enabled') . '<br>' . "\n";
+ $detected .= lang('You appear to have IMAP
support enabled') . '<br />' . "\n";
}
else
{
- $detected .= lang('No IMAP support found.
Disabling IMAP email access') . '<br>' . "\n";
+ $detected .= lang('No IMAP support found.
Disabling IMAP email access') . '<br />' . "\n";
}
$no_guess = False;
if(file_exists('../header.inc.php') &&
is_file('../header.inc.php') && is_readable('../header.inc.php'))
{
- $detected .= lang('Found existing configuration
file. Loading settings from the file...') . '<br>' . "\n";
+ $detected .= lang('Found existing configuration
file. Loading settings from the file...') . '<br />' . "\n";
$GLOBALS['phpgw_info']['flags']['noapi'] = True;
$no_guess = true;
/* This code makes sure the newer multi-domain
supporting header.inc.php is being used */
if(!isset($GLOBALS['phpgw_domain']))
{
- $detected .= lang("You're using an old
configuration file format...") . '<br>' . "\n";
- $detected .= lang('Importing old
settings into the new format....') . '<br>' . "\n";
+ $detected .= lang("You're using an old
configuration file format...") . '<br />' . "\n";
+ $detected .= lang('Importing old
settings into the new format....') . '<br />' . "\n";
}
else
{
if(@$GLOBALS['phpgw_info']['server']['header_version'] !=
@$GLOBALS['phpgw_info']['server']['current_header_version'])
{
- $detected .= lang("You're using
an old header.inc.php version...") . '<br>' . "\n";
- $detected .= lang('Importing
old settings into the new format....') . '<br>' . "\n";
+ $detected .= lang("You're using
an old header.inc.php version...") . '<br />' . "\n";
+ $detected .= lang('Importing
old settings into the new format....') . '<br />' . "\n";
}
reset($GLOBALS['phpgw_domain']);
$default_domain =
each($GLOBALS['phpgw_domain']);
@@ -382,7 +382,7 @@
}
else
{
- $detected .= lang('Sample configuration not
found. using built in defaults') . '<br>' . "\n";
+ $detected .= lang('Sample configuration not
found. using built in defaults') . '<br />' . "\n";
$GLOBALS['phpgw_info']['server']['server_root']
= realpath('../'); //'/path/to/phpgroupware';
$GLOBALS['phpgw_info']['server']['include_root'] =
realpath('../');//'/path/to/phpgroupware';
/* This is the basic include needed on each
page for phpGroupWare application compliance */
@@ -433,7 +433,7 @@
// now guessing better settings then the default ones
if(!$no_guess)
{
- $detected .= lang('Now guessing better values
for defaults...') . '<br>' . "\n";
+ $detected .= lang('Now guessing better values
for defaults...') . '<br />' . "\n";
$this_dir =
dirname($_SERVER['SCRIPT_FILENAME']);
$updir = realpath('../');
//str_replace('/setup','',$this_dir);
$GLOBALS['phpgw_info']['server']['server_root']
= $updir;
@@ -509,7 +509,7 @@
if(!$found_dbtype)
{
/*
- $errors .= '<br><font color="red">' .
lang('Warning!') . '<br>'
+ $errors .= '<br /><font color="red">' .
lang('Warning!') . '<br />'
. lang('The db_type in defaults (%1) is
not supported on this server. using first supported
type.',$GLOBALS['phpgw_info']['server']['db_type'])
. '</font>';
*/
@@ -518,14 +518,14 @@
if(is_writeable('../header.inc.php') ||
(!file_exists('../header.inc.php') &&
is_writeable('../')))
{
- $errors .= '<br><input type="submit"
name="action[write]" value="'.lang('Write config').'"> '
+ $errors .= '<br /><input type="submit"
name="action[write]" value="'.lang('Write config').'"> '
. lang('or') . ' <input
type="submit" name="action[download]" value="'.lang('Download').'"> '
. lang('or') . ' <input
type=submit name="action[view]" value="'.lang('View').'"> '.lang('the
file').'.</form>';
}
else
{
- $errors .= '<br>'
- . lang('Cannot create the
header.inc.php due to file permission restrictions.<br> Instead you can %1 the
file.',
+ $errors .= '<br />'
+ . lang('Cannot create the
header.inc.php due to file permission restrictions.<br /> Instead you can %1
the file.',
'<input type="submit"
name="action[download]" value="'.lang('Download').'">' . lang('or') .
' <input type="submit" name="action[view]" value="'.lang('View').'">')
. '</form>';
}
@@ -557,7 +557,7 @@
$setup_tpl->set_var('lang_mcryptversion',lang('MCrypt
version'));
$setup_tpl->set_var('lang_mcryptversiondescr',lang('Set
this to "old" for versions < 2.4, otherwise the exact mcrypt version you
use.'));
$setup_tpl->set_var('lang_mcryptiv',lang('MCrypt
initialization vector'));
- $setup_tpl->set_var('lang_mcryptivdescr',lang('This
should be around 30 bytes in length.<br>Note: The default has been randomly
generated.'));
+ $setup_tpl->set_var('lang_mcryptivdescr',lang('This
should be around 30 bytes in length.<br />Note: The default has been randomly
generated.'));
$setup_tpl->set_var('lang_domselect',lang('Domain
select box on login'));
$setup_tpl->set_var('lang_domain_from_host',
lang('Automatically detect domain from hostname'));
$setup_tpl->set_var('lang_note_domain_from_host',
lang('Note: This option will only work if show domain select box is off.'));
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] setup/manageheader.php, 1.49,
nomail <=