diff --git a/admin/inc/hook_config.inc.php b/admin/inc/hook_config.inc.php
index 84b2b14277..333a79a9fa 100644
--- a/admin/inc/hook_config.inc.php
+++ b/admin/inc/hook_config.inc.php
@@ -32,7 +32,7 @@
{
if ($config['mcrypt_algo'] == $value)
{
- $selected = ' selected';
+ $selected = ' selected="selected"';
}
else
{
@@ -77,7 +77,7 @@
{
if ($config['mcrypt_mode'] == $value)
{
- $selected = ' selected';
+ $selected = ' selected="selected"';
}
else
{
@@ -92,12 +92,12 @@
if(!$found)
{
/* Something is wrong with their mcrypt install or php.ini */
- $out = '' . lang('no modes available') . ' ' . "\n";
+ $out = '' . lang('no modes available') . ' ' . "\n";
}
}
else
{
- $out = 'CBC ' . "\n";
+ $out = 'CBC ' . "\n";
}
return $out;
}
diff --git a/phpgwapi/inc/class.egw_db.inc.php b/phpgwapi/inc/class.egw_db.inc.php
index f0c6dbe3df..a4fedcf128 100644
--- a/phpgwapi/inc/class.egw_db.inc.php
+++ b/phpgwapi/inc/class.egw_db.inc.php
@@ -798,17 +798,17 @@
if ($file)
{
- printf("File: %s",$file);
+ printf("File: %s",$file);
}
if ($line)
{
- printf("Line: %s",$line);
+ printf("Line: %s",$line);
}
- printf("Function: %s\n",function_backtrace(2));
+ printf("Function: %s
\n",function_backtrace(2));
if ($this->Halt_On_Error != "report")
{
- echo "Session halted. ";
+ echo "
Session halted.
";
if (is_object($GLOBALS['egw']->common))
{
$GLOBALS['egw']->common->phpgw_exit(True);
diff --git a/phpgwapi/inc/class.html.inc.php b/phpgwapi/inc/class.html.inc.php
index 8b94be25e7..d94d423fa0 100644
--- a/phpgwapi/inc/class.html.inc.php
+++ b/phpgwapi/inc/class.html.inc.php
@@ -349,7 +349,7 @@ class html
}
}
}
- return ''.
$this->htmlspecialchars($no_lang || $label == '' ? $label : lang($label)) . " \n";
}
diff --git a/setup/applications.php b/setup/applications.php
index 3c1ebed9fb..82aa88b89e 100644
--- a/setup/applications.php
+++ b/setup/applications.php
@@ -140,22 +140,22 @@
if ($setup_info[$appname]['tables'])
{
$GLOBALS['egw_setup']->process->droptables($terror,$DEBUG);
- echo ' ' . $app_title . ' ' . lang('tables dropped') . '.';
+ echo ' ' . $app_title . ' ' . lang('tables dropped') . '.';
}
$GLOBALS['egw_setup']->deregister_app($setup_info[$appname]['name']);
- echo ' ' . $app_title . ' ' . lang('deregistered') . '.';
+ echo ' ' . $app_title . ' ' . lang('deregistered') . '.';
if ($setup_info[$appname]['hooks'])
{
$GLOBALS['egw_setup']->deregister_hooks($setup_info[$appname]['name']);
- echo ' ' . $app_title . ' ' . lang('hooks deregistered') . '.';
+ echo ' ' . $app_title . ' ' . lang('hooks deregistered') . '.';
}
$do_langs = true;
if ($historylog->delete($appname))
{
- echo ' ' . $app_title . ' ' . lang('Historylog removed') . '.';
+ echo ' ' . $app_title . ' ' . lang('Historylog removed') . '.';
}
// delete all application categories and ACL
@@ -176,7 +176,7 @@
{
$terror = $GLOBALS['egw_setup']->process->current($terror,$DEBUG);
$terror = $GLOBALS['egw_setup']->process->default_records($terror,$DEBUG);
- echo ' ' . $app_title . ' '
+ echo ' ' . $app_title . ' '
. lang('tables installed, unless there are errors printed above') . '.';
}
else
@@ -189,12 +189,12 @@
{
$GLOBALS['egw_setup']->register_app($setup_info[$appname]['name']);
}
- echo ' ' . $app_title . ' ' . lang('registered') . '.';
+ echo ' ' . $app_title . ' ' . lang('registered') . '.';
if ($setup_info[$appname]['hooks'])
{
$GLOBALS['egw_setup']->register_hooks($setup_info[$appname]['name']);
- echo ' ' . $app_title . ' ' . lang('hooks registered') . '.';
+ echo ' ' . $app_title . ' ' . lang('hooks registered') . '.';
}
}
$do_langs = true;
@@ -212,12 +212,12 @@
$GLOBALS['egw_setup']->process->upgrade($terror,$DEBUG);
if ($setup_info[$appname]['tables'])
{
- echo ' ' . $app_title . ' ' . lang('tables upgraded') . '.';
+ echo ' ' . $app_title . ' ' . lang('tables upgraded') . '.';
// The process_upgrade() function also handles registration
}
else
{
- echo ' ' . $app_title . ' ' . lang('upgraded') . '.';
+ echo ' ' . $app_title . ' ' . lang('upgraded') . '.';
}
$do_langs = true;
}
@@ -227,7 +227,7 @@
$GLOBALS['egw_setup']->process->translation->drop_add_all_langs();
}
//$setup_tpl->set_var('goback',
- echo '' . lang('Go back') . ' ';
+ echo '' . lang('Go back') . ' ';
//$setup_tpl->pparse('out','submit');
$setup_tpl->pparse('out','footer');
exit;
@@ -275,7 +275,7 @@
}
}
- echo '' . lang('Go back') . ' ';
+ echo '' . lang('Go back') . ' ';
$setup_tpl->pparse('out','footer');
exit;
}
@@ -291,18 +291,18 @@
{
echo '"' . $app_title . '" ' . lang('may be broken') . ' ';
echo lang('because an application it depends upon was upgraded');
- echo ' ';
+ echo ' ';
echo lang('to a version it does not know about') . '.';
- echo ' ';
+ echo ' ';
echo lang('However, the application may still work') . '.';
}
elseif(get_var('badinstall',Array('GET')))
{
echo '"' . $app_title . '" ' . lang('is broken') . ' ';
echo lang('because of a failed upgrade or install') . '.';
- echo ' ';
+ echo ' ';
echo lang('Some or all of its tables are missing') . '.';
- echo ' ';
+ echo ' ';
echo lang('You should either uninstall and then reinstall it, or attempt manual repairs') . '.';
}
elseif (!$version)
@@ -320,12 +320,12 @@
{
if($setup_info[$resolve]['status'] == 'D')
{
- echo lang('because it depends upon') . ': ' . "\n";
+ echo lang('because it depends upon') . ': ' . "\n";
list($depapp,$depver) = parsedep($setup_info[$resolve]['depends'],False);
$depapp_count = count($depapp);
for ($i=0; $i<$depapp_count; $i++)
{
- echo ' ' . $depapp[$i] . ': ';
+ echo ' ' . $depapp[$i] . ': ';
$list = '';
foreach($depver[$i] as $x => $y)
{
@@ -334,7 +334,7 @@
$list = substr($list,0,-2);
echo "$list\n";
}
- echo ' ' . lang('The table definition was correct, and the tables were installed') . '.';
+ echo ' ' . lang('The table definition was correct, and the tables were installed') . '.';
}
else
{
@@ -351,32 +351,32 @@
}
else
{
- echo lang('because it requires manual table installation, or the table definition was incorrect') . ".\n"
+ echo lang('because it requires manual table installation, or the table definition was incorrect') . ".\n"
. lang("Please check for sql scripts within the application's directory") . '.';
}
- echo ' ' . lang('However, the application is otherwise installed') . '.';
+ echo ' ' . lang('However, the application is otherwise installed') . '.';
}
else
{
echo $app_title . ' ' . lang('has a version mismatch') . ' ';
echo lang('because of a failed upgrade, or the database is newer than the installed version of this app') . '.';
- echo ' ';
+ echo ' ';
echo lang('If the application has no defined tables, selecting upgrade should remedy the problem') . '.';
- echo ' ' . lang('However, the application is otherwise installed') . '.';
+ echo ' ' . lang('However, the application is otherwise installed') . '.';
}
- echo '' . lang('Go back') . ' ';
+ echo '' . lang('Go back') . ' ';
$setup_tpl->pparse('out','footer');
exit;
}
else
{
$setup_tpl->set_var('description',lang('Select the desired action(s) from the available choices'));
+ $setup_tpl->set_var('action_url','applications.php');
$setup_tpl->pparse('out','header');
$setup_tpl->set_var('appdata',lang('Application Data'));
$setup_tpl->set_var('actions',lang('Actions'));
- $setup_tpl->set_var('action_url','applications.php');
$setup_tpl->set_var('app_info',lang('Application Name and Status Information'));
$setup_tpl->set_var('app_title',lang('Application Title'));
$setup_tpl->set_var('app_currentver',lang('Current Version'));
@@ -390,7 +390,7 @@
$setup_tpl->set_var('upgrade_all',lang('Upgrade All'));
$setup_tpl->set_var('remove_all',lang('Remove All'));
$setup_tpl->set_var('lang_debug',lang('enable for extra debug-messages'));
- $setup_tpl->set_var('debug',' ');
+ $setup_tpl->set_var('debug',' ');
$setup_tpl->set_var('bg_color',$bgcolor[0]);
$setup_tpl->pparse('out','app_header');
@@ -409,7 +409,7 @@
switch($value['status'])
{
case 'C':
- $setup_tpl->set_var('remove',' ');
+ $setup_tpl->set_var('remove',' ');
$setup_tpl->set_var('upgrade',' ');
if (!$GLOBALS['egw_setup']->detection->check_app_tables($value['name']))
{
@@ -452,7 +452,7 @@
if ($value['tables'] && $GLOBALS['egw_setup']->detection->check_app_tables($value['name'],True))
{
// Some tables missing
- $setup_tpl->set_var('remove',' ');
+ $setup_tpl->set_var('remove',' ');
$setup_tpl->set_var('resolution','' . lang('Potential Problem') . ' ');
$status = lang('Requires reinstall or manual repair') . ' - ' . $value['status'];
}
@@ -463,7 +463,7 @@
$status = lang('Requires upgrade') . ' - ' . $value['status'];
}
$setup_tpl->set_var('bg_color','CCFFCC');
- $setup_tpl->set_var('install',' ');
+ $setup_tpl->set_var('install',' ');
$setup_tpl->set_var('upgrade',' ');
$status = lang('Please install') . ' - ' . $value['status'];
}
@@ -472,8 +472,8 @@
$setup_tpl->set_var('bg_color','CCCCFF');
$setup_tpl->set_var('install',' ');
// TODO display some info about breakage if you mess with this app
- $setup_tpl->set_var('upgrade',' ');
- $setup_tpl->set_var('remove',' ');
+ $setup_tpl->set_var('upgrade',' ');
+ $setup_tpl->set_var('remove',' ');
$setup_tpl->set_var('resolution','');
$status = lang('Requires upgrade') . ' - ' . $value['status'];
}
@@ -482,8 +482,8 @@
$setup_tpl->set_var('instimg','incomplete.png');
$setup_tpl->set_var('instalt',lang('Not Completed'));
$setup_tpl->set_var('install',' ');
- $setup_tpl->set_var('remove',' ');
- $setup_tpl->set_var('upgrade',' ');
+ $setup_tpl->set_var('remove',' ');
+ $setup_tpl->set_var('upgrade',' ');
$setup_tpl->set_var('resolution','' . lang('Possible Solutions') . ' ');
$status = lang('Version Mismatch') . ' - ' . $value['status'];
break;
diff --git a/setup/check_install.php b/setup/check_install.php
index fbadebe5af..5bf881846f 100644
--- a/setup/check_install.php
+++ b/setup/check_install.php
@@ -38,9 +38,9 @@
exit;
}
}
- $passed_icon = ' ';
- $error_icon = '';
- $warning_icon = ' ';
+ $passed_icon = ' ';
+ $error_icon = ' ';
+ $warning_icon = ' ';
}
else
{
@@ -98,42 +98,42 @@
),
'mysql' => array(
'func' => 'extension_check',
- 'warning' => "" . lang('The %1 extension is needed, if you plan to use a %2 database.','mysql','MySQL').'
'
+ 'warning' => "" . lang('The %1 extension is needed, if you plan to use a %2 database.','mysql','MySQL').'
'
),
'pgsql' => array(
'func' => 'extension_check',
- 'warning' => '' . lang('The %1 extension is needed, if you plan to use a %2 database.','pgsql','pgSQL').'
'
+ 'warning' => '' . lang('The %1 extension is needed, if you plan to use a %2 database.','pgsql','pgSQL').'
'
),
'mssql' => array(
'func' => 'extension_check',
- 'warning' => '' . lang('The %1 extension is needed, if you plan to use a %2 database.','mssql','MsSQL') . '
',
+ 'warning' => '' . lang('The %1 extension is needed, if you plan to use a %2 database.','mssql','MsSQL') . '
',
'win_only' => True
),
'odbc' => array(
'func' => 'extension_check',
- 'warning' => '' . lang('The %1 extension is needed, if you plan to use a %2 database.','odbc','MaxDB, MsSQL or Oracle') . '
',
+ 'warning' => '' . lang('The %1 extension is needed, if you plan to use a %2 database.','odbc','MaxDB, MsSQL or Oracle') . '
',
),
'oci8' => array(
'func' => 'extension_check',
- 'warning' => '' . lang('The %1 extension is needed, if you plan to use a %2 database.','oci','Oracle') . '
',
+ 'warning' => '' . lang('The %1 extension is needed, if you plan to use a %2 database.','oci','Oracle') . '
',
),
'mbstring' => array(
'func' => 'extension_check',
- 'warning' => '' . lang('The mbstring extension is needed to fully support unicode (utf-8) or other multibyte-charsets.') . "
"
+ 'warning' => '' . lang('The mbstring extension is needed to fully support unicode (utf-8) or other multibyte-charsets.') . "
"
),
'mbstring.func_overload' => array(
'func' => 'php_ini_check',
'value' => 7,
- 'warning' => '' . lang('The mbstring.func_overload = 7 is needed to fully support unicode (utf-8) or other multibyte-charsets.') . "
",
+ 'warning' => '' . lang('The mbstring.func_overload = 7 is needed to fully support unicode (utf-8) or other multibyte-charsets.') . "
",
'change' => extension_loaded('mbstring') || function_exists('dl') && @dl(PHP_SHLIB_PREFIX.'mbstring.'.PHP_SHLIB_SUFFIX) ? 'mbstring.func_overload = 7' : '',
),
'imap' => array(
'func' => 'extension_check',
- 'warning' => '' . lang('The imap extension is needed by the two email apps (even if you use email with pop3 as protocoll).') . '
'
+ 'warning' => '' . lang('The imap extension is needed by the two email apps (even if you use email with pop3 as protocoll).') . '
'
),
'session' => array(
'func' => 'extension_check',
- 'warning' => '' . lang('The session extension is needed to use php4 session (db-sessions work without).') . "
"
+ 'warning' => '' . lang('The session extension is needed to use php4 session (db-sessions work without).') . "
"
),
'.' => array(
'func' => 'permission_check',
@@ -178,17 +178,17 @@
return True; // check only under windows
}
// we check for the existens of 'dl', as multithreaded webservers dont have it !!!
- $availible = extension_loaded($name) || function_exists('dl') && @dl(PHP_SHLIB_PREFIX.$name.'.'.PHP_SHLIB_SUFFIX);
+ $available = extension_loaded($name) || function_exists('dl') && @dl(PHP_SHLIB_PREFIX.$name.'.'.PHP_SHLIB_SUFFIX);
- echo ($availible ? $passed_icon : $warning_icon).' '.lang('Checking extension %1 is loaded or loadable',$name).': '.($availible ? lang('True') : lang('False'))." \n";
+ echo ''.($available ? $passed_icon : $warning_icon).' '.lang('Checking extension %1 is loaded or loadable',$name).': '.($available ? lang('True') : lang('False'))."
\n";
- if (!$availible)
+ if (!$available)
{
echo $args['warning'];
}
echo "\n";
- return $availible;
+ return $available;
}
function verbosePerms( $in_Perms )
@@ -278,17 +278,17 @@
$checks = implode(', ',$checks);
$icon = $passed_icon;
- $msg = lang('Checking file-permissions of %1 for %2: %3',$rel_name,$checks,$perms)." \n";
+ $msg = lang('Checking file-permissions of %1 for %2: %3',$rel_name,$checks,$perms)." \n";
if (!file_exists($name))
{
- echo $error_icon . $msg . lang('%1 does not exist !!!',$rel_name)." \n";
+ echo ''. $error_icon . '' . $msg . lang('%1 does not exist !!!',$rel_name)."
\n";
return False;
}
$warning = False;
if (!$GLOBALS['run_by_webserver'] && (@$args['is_readable'] || @$args['is_writable']))
{
- echo $warning_icon.' '.$msg. lang('Check can only be performed, if called via a webserver, as the user-id/-name of the webserver is not known.')." \n";
+ echo $warning_icon.' '.$msg. lang('Check can only be performed, if called via a webserver, as the user-id/-name of the webserver is not known.')."\n";
unset($args['is_readable']);
unset($args['is_writable']);
$warning = True;
@@ -296,22 +296,22 @@
$Ok = True;
if (isset($args['is_writable']) && is_writable($name) != $args['is_writable'])
{
- echo "$error_icon $msg ".lang('%1 is %2%3 !!!',$rel_name,$args['is_writable']?lang('not').' ':'',lang('writable by the webserver'))." \n";
+ echo ''.$error_icon.' '.$msg.' '.lang('%1 is %2%3 !!!',$rel_name,$args['is_writable']?lang('not').' ':'',lang('writable by the webserver'))."
\n";
$Ok = False;
}
if (isset($args['is_readable']) && is_readable($name) != $args['is_readable'])
{
- echo "$error_icon $msg ". lang('%1 is %2%3 !!!',$rel_name,$args['is_readable']?lang('not').' ':'',lang('readable by the webserver'))." \n";
+ echo ''.$error_icon.' '.$msg.' '.lang('%1 is %2%3 !!!',$rel_name,$args['is_readable']?lang('not').' ':'',lang('readable by the webserver'))."
\n";
$Ok = False;
}
if (!$is_windows && isset($args['is_world_readable']) && !(fileperms($name) & 04) == $args['is_world_readable'])
{
- echo "$error_icon $msg" . lang('%1 is %2%3 !!!',$rel_name,$args['is_world_readable']?lang('not').' ':'',lang('world readable'))." \n";
+ echo ''.$error_icon.' '.$msg.' '.lang('%1 is %2%3 !!!',$rel_name,$args['is_world_readable']?lang('not').' ':'',lang('world readable'))."
\n";
$Ok = False;
}
if (!$is_windows && isset($args['is_world_writable']) && !(fileperms($name) & 02) == $args['is_world_writable'])
{
- echo "$error_icon $msg " . lang('%1 is %2%3 !!!',$rel_name,$args['is_world_writable']?lang('not').' ':'',lang('world writable'))." \n";
+ echo ''.$error_icon.' '.$msg.' '.lang('%1 is %2%3 !!!',$rel_name,$args['is_world_writable']?lang('not').' ':'',lang('world writable'))."
\n";
$Ok = False;
}
if ($Ok && !$warning && $verbose)
@@ -322,7 +322,7 @@
{
if ($verbose)
{
- echo "" . lang('This might take a while, please wait ...')."
\n";
+ echo "" . lang('This might take a while, please wait ...')."
\n";
flush();
}
@set_time_limit(0);
@@ -386,30 +386,30 @@
$result = $ini_value == $args['value'];
break;
}
- $msg = ' '.lang('Checking php.ini').": $name $check $verbose_value: ini_get('$name')='$ini_value'$ini_value_verbose
\n";
+ $msg = ' '.lang('Checking php.ini').": $name $check $verbose_value: ini_get('$name')='$ini_value'$ini_value_verbose ";
if ($result)
{
- echo $passed_icon.$msg;
+ echo "".$passed_icon.$msg."
\n";
}
if (!$result)
{
if (isset($args['warning']))
{
- echo $warning_icon.$msg.$args['warning']." \n";
+ echo "".$warning_icon.'
'.$msg.' '.$args['warning']."
\n";
}
if (isset($args['error']))
{
- echo $error_icon.$msg.$args['error']."\n";
+ echo "".$error_icon.'
'.$msg.' '.$args['error']."
\n";
}
if (isset($args['safe_mode']) && $safe_mode || @$args['change'])
{
if (!isset($args['warning']) && !isset($args['error']))
{
- echo $error_icon.$msg." ";
+ echo ''.$error_icon.' '.$msg.'
';
}
- echo "\n";
- echo '*** '.lang('Please make the following change in your php.ini').' ('.get_php_ini().'): '.(@$args['safe_mode']?$args['safe_mode']:$args['change'])."
\n";
+ echo "
\n";
+ echo '*** '.lang('Please make the following change in your php.ini').' ('.get_php_ini().'): '.(@$args['safe_mode']?$args['safe_mode']:$args['change'])." \n";
echo '*** '.lang('AND reload your webserver, so the above changes take effect !!!')."
\n";
}
}
@@ -431,7 +431,7 @@
global $passed_icon, $warning_icon;
$available = (function_exists('imagecopyresampled') || function_exists('imagecopyresized'));
- echo ($available ? $passed_icon : $warning_icon).' '.lang('Checking for GD support...').': '.($available ? lang('True') : lang('False'))."
\n";
+ echo "
".($available ? $passed_icon : $warning_icon).' '.lang('Checking for GD support...').': '.($available ? lang('True') : lang('False'))."
\n";
if (!$available)
{
@@ -461,8 +461,8 @@
{
echo '
\n";
}
- echo '
'.lang('The first step in installing eGroupWare is to ensure your environment has the necessary settings to correctly run the application.');
- echo ' '.lang('We will now run a series of tests, which may take a few minutes. Click the link below to proceed.');
+ echo '
'.lang('The first step in installing eGroupWare is to ensure your environment has the necessary settings to correctly run the application.').'
';
+ echo '
'.lang('We will now run a series of tests, which may take a few minutes. Click the link below to proceed.').'
';
echo '
';
$setup_tpl->pparse('out','T_footer');
exit;
@@ -509,7 +509,7 @@
{
echo lang('Please fix the above errors (%1) and warnings(%2)',$error_icon,$warning_icon).'. ';
}
- echo '
'.lang('Return to Setup')." \n";
+ echo '
'.lang('Return to Setup')." \n";
}
$setup_tpl->pparse('out','T_footer');
//echo "