diff --git a/phpgwapi/inc/class.nextmatchs.inc.php b/phpgwapi/inc/class.nextmatchs.inc.php index 75f0e6f9c5..ef5b45ccb1 100644 --- a/phpgwapi/inc/class.nextmatchs.inc.php +++ b/phpgwapi/inc/class.nextmatchs.inc.php @@ -243,7 +243,7 @@ $c_extraparams = count($extraparams) + 1; for($i=0;$i<$c_extraparams;$i++) { - if($extraparams[$i]) + if(isset($extraparams[$i])) { list($var,$value) = explode('=',$extraparams[$i]); if($var != 'menuaction') @@ -306,7 +306,7 @@ 'filter' => $filter, 'q_field' => $qfield, 'sort' => $sort, - 'query' => urlencode(stripslashes($GLOBALS['query'])) + 'query' => urlencode(stripslashes(@$GLOBALS['query'])) ); $extravars = $this->split_extras($extravars,$extradata); @@ -360,7 +360,7 @@ 'filter' => $filter, 'q_field' => $qfield, 'sort' => $sort, - 'query' => urlencode(stripslashes($GLOBALS['query'])) + 'query' => urlencode(stripslashes(@$GLOBALS['query'])) ); $extravars = $this->split_extras($extravars,$extradata); @@ -683,7 +683,7 @@ { if (! $currentcolor) { - $currentcolor = $GLOBALS['tr_color']; + $currentcolor = @$GLOBALS['tr_color']; } if ($currentcolor == $GLOBALS['phpgw_info']['theme']['row_on']) @@ -742,7 +742,7 @@ $extra = $this->extras_to_string($extra); } - $extravar = 'order='.$var.'&sort='.$sort.'&filter='.$filter.'&qfield='.$qfield.'&start='.$start.'&query='.urlencode(stripslashes($GLOBALS['query'])).$extra; + $extravar = 'order='.$var.'&sort='.$sort.'&filter='.$filter.'&qfield='.$qfield.'&start='.$start.'&query='.urlencode(stripslashes(@$GLOBALS['query'])).$extra; $link = ($this->action?$this->page($extravar):$GLOBALS['phpgw']->link($program,$extravar)); diff --git a/phpgwapi/inc/common_functions.inc.php b/phpgwapi/inc/common_functions.inc.php index ebc24c9c61..af118cd14c 100755 --- a/phpgwapi/inc/common_functions.inc.php +++ b/phpgwapi/inc/common_functions.inc.php @@ -692,7 +692,7 @@ { if ($p1 == '_UNDEF_' && $p1 != 1) { - $obj = new $classname; + $obj = @new $classname; } else { diff --git a/phpgwapi/inc/footer.inc.php b/phpgwapi/inc/footer.inc.php index 147bfefb49..c566a48426 100644 --- a/phpgwapi/inc/footer.inc.php +++ b/phpgwapi/inc/footer.inc.php @@ -36,16 +36,16 @@ \**************************************************************************/ if (PHPGW_APP_INC != PHPGW_API_INC && // this prevents an endless inclusion on the homepage // (some apps set currentapp in hook_home => it's not releyable) - (file_exists (PHPGW_APP_INC . '/footer.inc.php') || isset($GLOBALS['HTTP_GET_VARS']['menuaction'])) && + (file_exists (PHPGW_APP_INC . '/footer.inc.php') || isset($_GET['menuaction'])) && $GLOBALS['phpgw_info']['flags']['currentapp'] != 'home' && $GLOBALS['phpgw_info']['flags']['currentapp'] != 'login' && $GLOBALS['phpgw_info']['flags']['currentapp'] != 'logout' && !@$GLOBALS['phpgw_info']['flags']['noappfooter']) { - if ($GLOBALS['HTTP_GET_VARS']['menuaction']) + if ($_GET['menuaction']) { - list($app,$class,$method) = explode('.',$GLOBALS['HTTP_GET_VARS']['menuaction']); - if (is_array($GLOBALS[$class]->public_functions) && $GLOBALS[$class]->public_functions['footer']) + list($app,$class,$method) = explode('.',$_GET['menuaction']); + if (is_array($GLOBALS[$class]->public_functions) && isset($GLOBALS[$class]->public_functions['footer'])) { // eval("\$GLOBALS[$class]->footer();"); $GLOBALS[$class]->footer();