diff --git a/setup/inc/class.schema_proc_pgsql.inc.php b/setup/inc/class.schema_proc_pgsql.inc.php
index 682461b0d6..779a3bf1f6 100644
--- a/setup/inc/class.schema_proc_pgsql.inc.php
+++ b/setup/inc/class.schema_proc_pgsql.inc.php
@@ -408,7 +408,7 @@
function GetSequenceForTable($oProc,$table,&$sSequenceName)
{
global $DEBUG;
- if($DEBUG) { echo '
GetSequenceForTable: You rang?'; }
+ if($DEBUG) { echo '
GetSequenceForTable: ' . $table; }
$oProc->m_odb->query("SELECT relname FROM pg_class WHERE NOT relname ~ 'pg_.*' AND relname LIKE 'seq_$table' AND relkind='S' ORDER BY relname",__LINE__,__FILE__);
$oProc->m_odb->next_record();
diff --git a/setup/inc/class.setup.inc.php b/setup/inc/class.setup.inc.php
index 1d22058f2c..bfa7dd2f3e 100644
--- a/setup/inc/class.setup.inc.php
+++ b/setup/inc/class.setup.inc.php
@@ -82,27 +82,27 @@
$FormLogout == 'ldapimport' ||
$FormLogout == 'sqltoarray')
{
- setcookie("ConfigPW"); // scrub the old one
- setcookie("ConfigDomain"); // scrub the old one
- setcookie("ConfigLang");
- $phpgw_info["setup"]["ConfigLoginMSG"] = "You have successfully logged out";
+ setcookie('ConfigPW'); // scrub the old one
+ setcookie('ConfigDomain'); // scrub the old one
+ setcookie('ConfigLang');
+ $GLOBALS['phpgw_info']['setup']['ConfigLoginMSG'] = 'You have successfully logged out';
return False;
}
- elseif($FormLogout == "header")
+ elseif($FormLogout == 'header')
{
- setcookie("HeaderPW"); // scrub the old one
- $phpgw_info["setup"]["HeaderLoginMSG"] = "You have successfully logged out";
+ setcookie('HeaderPW'); // scrub the old one
+ $GLOBALS['phpgw_info']['setup']['HeaderLoginMSG'] = 'You have successfully logged out';
return False;
}
}
elseif (isset($ConfigPW))
{
- if ($ConfigPW != $phpgw_domain[$ConfigDomain]["config_passwd"] && $auth_type == "Config")
+ if ($ConfigPW != $phpgw_domain[$ConfigDomain]["config_passwd"] && $auth_type == 'Config')
{
- setcookie("ConfigPW"); // scrub the old one
- setcookie("ConfigDomain"); // scrub the old one
- setcookie("ConfigLang");
- $phpgw_info["setup"]["ConfigLoginMSG"] = "Invalid session cookie (cookies must be enabled)";
+ setcookie('ConfigPW'); // scrub the old one
+ setcookie('ConfigDomain'); // scrub the old one
+ setcookie('ConfigLang');
+ $phpgw_info['setup']['ConfigLoginMSG'] = 'Invalid session cookie (cookies must be enabled)';
return False;
}
else
@@ -114,41 +114,41 @@
{
if (isset($ConfigLogin))
{
- if ($FormPW == $phpgw_domain[$FormDomain]["config_passwd"] && $auth_type == "Config")
+ if ($FormPW == $phpgw_domain[$FormDomain]['config_passwd'] && $auth_type == 'Config')
{
- setcookie("HeaderPW"); // scrub the old one
- setcookie("ConfigPW",$FormPW);
- setcookie("ConfigDomain",$FormDomain);
- setcookie("ConfigLang",$ConfigLang);
+ setcookie('HeaderPW'); // scrub the old one
+ setcookie('ConfigPW',$FormPW);
+ setcookie('ConfigDomain',$FormDomain);
+ setcookie('ConfigLang',$ConfigLang);
$ConfigDomain = $FormDomain;
return True;
}
else
{
- $phpgw_info["setup"]["ConfigLoginMSG"] = "Invalid password";
+ $phpgw_info['setup']['ConfigLoginMSG'] = 'Invalid password';
return False;
}
}
elseif (isset($HeaderLogin))
{
- if ($FormPW == $phpgw_info["server"]["header_admin_password"] && $auth_type == "Header")
+ if ($FormPW == $phpgw_info['server']['header_admin_password'] && $auth_type == 'Header')
{
- setcookie("HeaderPW",$FormPW);
+ setcookie('HeaderPW',$FormPW);
return True;
}
else
{
- $phpgw_info["setup"]["HeaderLoginMSG"] = "Invalid password";
+ $GLOBALS['phpgw_info']['setup']['HeaderLoginMSG'] = 'Invalid password';
return False;
}
}
}
elseif (isset($HeaderPW))
{
- if ($HeaderPW != $phpgw_info["server"]["header_admin_password"] && $auth_type == "Header")
+ if ($HeaderPW != $phpgw_info['server']['header_admin_password'] && $auth_type == 'Header')
{
- setcookie("HeaderPW"); // scrub the old one
- $phpgw_info["setup"]["HeaderLoginMSG"] = "Invalid session cookie (cookies must be enabled)";
+ setcookie('HeaderPW'); // scrub the old one
+ $GLOBALS['phpgw_info']['setup']['HeaderLoginMSG'] = 'Invalid session cookie (cookies must be enabled)';
return False;
}
else
diff --git a/setup/inc/class.setup_html.inc.php b/setup/inc/class.setup_html.inc.php
index 74a034a150..d093c9a378 100644
--- a/setup/inc/class.setup_html.inc.php
+++ b/setup/inc/class.setup_html.inc.php
@@ -33,8 +33,6 @@
function setup_tpl_dir($app_name='setup')
{
- global $phpgw_info;
-
// hack to get tpl dir
if (is_dir(PHPGW_SERVER_ROOT))
{
@@ -52,57 +50,48 @@
function show_header($title = '',$nologoutbutton = False, $logoutfrom = 'config', $configdomain = '')
{
- global $phpgw_info, $setup_tpl, $HTTP_SERVER_VARS;
-
- $setup_tpl->set_var('lang_charset',lang('charset'));
+ $GLOBALS['setup_tpl']->set_var('lang_charset',lang('charset'));
if ($nologoutbutton)
{
$btn_logout = ' ';
}
else
{
- $btn_logout = ''.lang('Logout').'';
+ $btn_logout = ''.lang('Logout').'';
}
- $setup_tpl->set_var('lang_setup', lang('setup'));
- $setup_tpl->set_var('page_title',$title);
+ $GLOBALS['setup_tpl']->set_var('lang_setup', lang('setup'));
+ $GLOBALS['setup_tpl']->set_var('page_title',$title);
if ($configdomain == '')
{
- $setup_tpl->set_var('configdomain',"");
+ $GLOBALS['setup_tpl']->set_var('configdomain',"");
}
else
{
- $setup_tpl->set_var('configdomain',' - ' . lang('Domain') . ': '.$configdomain);
+ $GLOBALS['setup_tpl']->set_var('configdomain',' - ' . lang('Domain') . ': '.$configdomain);
}
- $setup_tpl->set_var('pgw_ver',$phpgw_info['server']['versions']['phpgwapi']);
- $setup_tpl->set_var('logoutbutton',$btn_logout);
- $setup_tpl->pparse('out','T_head');
+ $GLOBALS['setup_tpl']->set_var('pgw_ver',$phpgw_info['server']['versions']['phpgwapi']);
+ $GLOBALS['setup_tpl']->set_var('logoutbutton',$btn_logout);
+ $GLOBALS['setup_tpl']->pparse('out','T_head');
//$setup_tpl->set_var('T_head','');
}
function show_footer()
{
- global $phpgw_info, $setup_tpl;
-
- $setup_tpl->pparse('out','T_footer');
- unset($setup_tpl);
+ $GLOBALS['setup_tpl']->pparse('out','T_footer');
+ unset($GLOBALS['setup_tpl']);
}
function show_alert_msg($alert_word='Setup alert',$alert_msg='setup alert (generic)')
{
- global $phpgw_info, $setup_tpl;
-
- $setup_tpl->set_var('V_alert_word',$alert_word);
- $setup_tpl->set_var('V_alert_msg',$alert_msg);
- $setup_tpl->pparse('out','T_alert_msg');
+ $GLOBALS['setup_tpl']->set_var('V_alert_word',$alert_word);
+ $GLOBALS['setup_tpl']->set_var('V_alert_msg',$alert_msg);
+ $GLOBALS['setup_tpl']->pparse('out','T_alert_msg');
}
function make_frm_btn_simple($pre_frm_blurb='',$frm_method='POST',$frm_action='',$input_type='submit',$input_value='',$post_frm_blurb='')
{
- // are these golbals necessary?
- global $phpgw_info, $setup_tpl;
-
- // a simple form has simple components
+ /* a simple form has simple components */
$simple_form =
$pre_frm_blurb ."\n"
.'