Move all HTTP_GET, etc to $_GET

This commit is contained in:
Miles Lott 2003-12-19 09:13:29 +00:00
parent 583ed7eede
commit 6d9fabe4ea
7 changed files with 48 additions and 51 deletions

View File

@ -121,9 +121,9 @@
$tpl->set_var($var);
$tpl->pfp('out','navbar');
// If the application has a header include, we now include it
if (!@$GLOBALS['phpgw_info']['flags']['noappheader'] && @isset($GLOBALS['HTTP_GET_VARS']['menuaction']))
if (!@$GLOBALS['phpgw_info']['flags']['noappheader'] && @isset($_GET['menuaction']))
{
list($app,$class,$method) = explode('.',$GLOBALS['HTTP_GET_VARS']['menuaction']);
list($app,$class,$method) = explode('.',$_GET['menuaction']);
if (is_array($GLOBALS[$class]->public_functions) && $GLOBALS[$class]->public_functions['header'])
{
$GLOBALS[$class]->header();

View File

@ -11,19 +11,17 @@
/* $Id$ */
if($GLOBALS['phpgw_info']['user']['preferences']['common']['show_generation_time'])
{
$mtime = microtime();
$mtime = explode(" ",$mtime);
$mtime = explode(' ',$mtime);
$mtime = $mtime[1] + $mtime[0];
$GLOBALS['page_start_time'] = $mtime;
}
// get used language code
$lang_code='en';
// get used language code
$lang_code = 'en';
$bodyheader = ' bgcolor="' . $GLOBALS['phpgw_info']['theme']['bg_color'] . '" alink="'
. $GLOBALS['phpgw_info']['theme']['alink'] . '" link="' . $GLOBALS['phpgw_info']['theme']['link'] . '" vlink="'
. $GLOBALS['phpgw_info']['theme']['vlink'] . '"';
@ -50,21 +48,20 @@
</script>
<![endif]-->';
}
if(!$GLOBALS['phpgw_info']['user']['preferences']['common']['disable_slider_effects'])
{
$slider_effects_src=$GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/idots/js/slidereffects.js';
$slider_effects='<script src="'.$slider_effects_src.'" type=text/javascript>
</script>';
}
else
{
$simple_show_hide_src=$GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/idots/js/simple_show_hide.js';
$simple_show_hide='<script src="'.$simple_show_hide_src.'" type=text/javascript>
</script>';
}
if(!$GLOBALS['phpgw_info']['user']['preferences']['common']['disable_slider_effects'])
{
$slider_effects_src = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/idots/js/slidereffects.js';
$slider_effects = '<script src="'.$slider_effects_src.'" type=text/javascript>
</script>';
}
else
{
$simple_show_hide_src = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/idots/js/simple_show_hide.js';
$simple_show_hide = '<script src="'.$simple_show_hide_src.'" type=text/javascript>
</script>';
}
$tpl = CreateObject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
$tpl->set_unknowns('remove');
$tpl->set_file(array('head' => 'head.tpl'));

View File

@ -225,9 +225,9 @@
}
$tpl->pfp('out','navbar');
// If the application has a header include, we now include it
if (!@$GLOBALS['phpgw_info']['flags']['noappheader'] && @isset($GLOBALS['HTTP_GET_VARS']['menuaction']))
if (!@$GLOBALS['phpgw_info']['flags']['noappheader'] && @isset($_GET['menuaction']))
{
list($app,$class,$method) = explode('.',$GLOBALS['HTTP_GET_VARS']['menuaction']);
list($app,$class,$method) = explode('.',$_GET['menuaction']);
if (is_array($GLOBALS[$class]->public_functions) && $GLOBALS[$class]->public_functions['header'])
{
$GLOBALS[$class]->header();

View File

@ -19,13 +19,13 @@
fclose($fp);
}
$p = createobject('phpgwapi.preferences');
$preferences = $p->read_repository();
$p = createobject('phpgwapi.preferences');
$preferences = $p->read_repository();
if(isset($preferences[$GLOBALS['phpgw_info']['flags']['currentapp']]['refreshTime']))
{
$refreshTime = $preferences[$GLOBALS['phpgw_info']['flags']['currentapp']]['refreshTime']*60;
}
$app = $GLOBALS['phpgw_info']['flags']['currentapp'];
$app = $app ? ' ['.(isset($GLOBALS['phpgw_info']['apps'][$app]) ? $GLOBALS['phpgw_info']['apps'][$app]['title'] : lang($app)).']':'';
@ -36,13 +36,13 @@
'img_icon' => PHPGW_IMAGES_DIR . '/favicon.ico',
'img_shortcut' => PHPGW_IMAGES_DIR . '/favicon.ico',
'charset' => $GLOBALS['phpgw']->translation->charset(),
'website_title' => $GLOBALS['phpgw_info']['server']['site_title'],
'app_name' => $app,
'body_tags' => $bodyheader .' '. $GLOBALS['phpgw']->common->get_body_attribs(),
'bg_color' => $GLOBALS['phpgw_info']['theme']['bg_color'],
'refreshTime' => $refreshTime,
'css' => $GLOBALS['phpgw']->common->get_css(),
'java_script' => $GLOBALS['phpgw']->common->get_java_script(),
'website_title' => $GLOBALS['phpgw_info']['server']['site_title'],
'app_name' => $app,
'body_tags' => $bodyheader .' '. $GLOBALS['phpgw']->common->get_body_attribs(),
'bg_color' => $GLOBALS['phpgw_info']['theme']['bg_color'],
'refreshTime' => $refreshTime,
'css' => $GLOBALS['phpgw']->common->get_css(),
'java_script' => $GLOBALS['phpgw']->common->get_java_script(),
);
$tpl->set_var($var);
$tpl->pfp('out','head');

View File

@ -53,14 +53,14 @@
$var['applications'] = $applications;
$var['home_link'] = $GLOBALS['phpgw_info']['navbar']['home']['url'];
$var['home_link'] = $GLOBALS['phpgw_info']['navbar']['home']['url'];
$var['preferences_link'] = $GLOBALS['phpgw_info']['navbar']['preferences']['url'];
$var['logout_link'] = $GLOBALS['phpgw_info']['navbar']['logout']['url'];
$var['help_link'] = $GLOBALS['phpgw_info']['navbar']['about']['url'];
$var['lang_welcome'] = lang('welcome');
$var['lang_preferences'] = lang('preferences');
$var['lang_logout'] = lang('logout');
$var['lang_help'] = lang('help');
$var['logout_link'] = $GLOBALS['phpgw_info']['navbar']['logout']['url'];
$var['help_link'] = $GLOBALS['phpgw_info']['navbar']['about']['url'];
$var['lang_welcome'] = lang('welcome');
$var['lang_preferences'] = lang('preferences');
$var['lang_logout'] = lang('logout');
$var['lang_help'] = lang('help');
// "powered_by_color" and "_size" are is also used by number of current users thing
$var['powered_by_size'] = '2';
@ -82,7 +82,7 @@
if (isset($GLOBALS['phpgw_info']['navbar']['admin']) && $GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers'])
{
$var['current_users'] = '<a class="main_menu_bottom" href="' . $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicurrentsessions.list_sessions')
. '">' . lang('Current users') . ': ' . $GLOBALS['phpgw']->session->total() . '</a>';
. '">' . lang('Current users') . ': ' . $GLOBALS['phpgw']->session->total() . '</a>';
$tpl->set_var($var);
}
else
@ -93,9 +93,9 @@
$var['user_info_name'] = $GLOBALS['phpgw']->common->display_fullname();
$var['user_info_date'] =
lang($GLOBALS['phpgw']->common->show_date(time(),'l')) . ' '
. lang($GLOBALS['phpgw']->common->show_date(time(),'F')) . ' '
. $GLOBALS['phpgw']->common->show_date(time(),'d, Y');
lang($GLOBALS['phpgw']->common->show_date(time(),'l')) . ' '
. lang($GLOBALS['phpgw']->common->show_date(time(),'F')) . ' '
. $GLOBALS['phpgw']->common->show_date(time(),'d, Y');
$var['user_info'] = $var['user_info_name'] .' - ' .$var['user_info_date'];
$var['user_info_size'] = '2';
$var['user_info_color'] = '#000000';
@ -145,9 +145,9 @@
}
$tpl->pfp('out','navbar');
// If the application has a header include, we now include it
if (!@$GLOBALS['phpgw_info']['flags']['noappheader'] && @isset($GLOBALS['HTTP_GET_VARS']['menuaction']))
if (!@$GLOBALS['phpgw_info']['flags']['noappheader'] && @isset($_GET['menuaction']))
{
list($app,$class,$method) = explode('.',$GLOBALS['HTTP_GET_VARS']['menuaction']);
list($app,$class,$method) = explode('.',$_GET['menuaction']);
if (is_array($GLOBALS[$class]->public_functions) && $GLOBALS[$class]->public_functions['header'])
{
$GLOBALS[$class]->header();

View File

@ -131,9 +131,9 @@
$GLOBALS['idots_tpl']->pparse('out','navbar_footer');
// If the application has a header include, we now include it
if (!@$GLOBALS['phpgw_info']['flags']['noappheader'] && @isset($GLOBALS['HTTP_GET_VARS']['menuaction']))
if (!@$GLOBALS['phpgw_info']['flags']['noappheader'] && @isset($_GET['menuaction']))
{
list($app,$class,$method) = explode('.',$GLOBALS['HTTP_GET_VARS']['menuaction']);
list($app,$class,$method) = explode('.',$_GET['menuaction']);
if (is_array($GLOBALS[$class]->public_functions) && $GLOBALS[$class]->public_functions['header'])
{
$GLOBALS[$class]->header();

View File

@ -145,9 +145,9 @@
$tpl->pfp('out','navbar');
// If the application has a header include, we now include it
if (!@$GLOBALS['phpgw_info']['flags']['noappheader'] && @isset($GLOBALS['HTTP_GET_VARS']['menuaction']))
if (!@$GLOBALS['phpgw_info']['flags']['noappheader'] && @isset($_GET['menuaction']))
{
list($app,$class,$method) = explode('.',$GLOBALS['HTTP_GET_VARS']['menuaction']);
list($app,$class,$method) = explode('.',$_GET['menuaction']);
if (is_array($GLOBALS[$class]->public_functions) && $GLOBALS[$class]->public_functions['header'])
{
$GLOBALS[$class]->header();